Commit from Sugar Labs: Translation System by user godiard.: 379 of 379 messages translated (0 fuzzy).

67 files changed, 91761 insertions, 15025 deletions

diff --git a/po/af.po b/po/af.po
index 8d6c9e1..4c99576 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-06-20 18:58-0400\n"
 "Last-Translator: Morgan Collett <morgan.collett@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,221 +15,877 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "Naam:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Omtrent My"
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
-msgstr "Kliek om die kleur the verander:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "Jy moet 'n naam inskryf."
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "Terug"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Klaar"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "Volgende"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "Verwyder vriend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "Maak vriend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Vout in gespesifiseerde kleure."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Kliek om jou kleur te verander:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Nie beskikbaar nie"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "Nooi na %s"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "Verwyder"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Identiteit"
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "Maak oop"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Seriële Nommer:"
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
-msgstr "Hou"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Sagteware"
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
-msgstr "Maak oop met"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Bou:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Fermware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Datem & Tyd"
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Tydsone"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Raam"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "nooit"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "dadelik"
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Knipbord objek: %s."
+msgid "%s seconds"
+msgstr "%s sekondes"
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Sleutel Tipe:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Aktiveerings Vertraging"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Geldigheidsverklaring Tipe:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Hoekie"
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Enkripsie Tipe:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Snykant"
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Taal"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Jammer, ek praat nie '%s'."
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Koppel"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Ontkoppel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Ontkoppel..."
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
-msgstr "Koppel..."
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
-msgstr "Gekoppel"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
-msgstr "Ontkoppel..."
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
-msgstr "Aangaan"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
-msgstr "Aansluit"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Vout in radio waarde: gebruik on/off."
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "Vout in radio waarde: gebruik on/off."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Draadloos"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "Radio"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Bediener:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Klaar"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Verwyder"
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "Baie min krag oor"
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d oor"
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Ontkoppel"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Koppel..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Gekoppel"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Kanaal"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Koppel"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Ontkoppel"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
-msgstr "Ontkoppel"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
-msgstr "Kanaal"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "Buurt"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Tuis"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Aktiwiteit"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -239,282 +895,874 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Om jou veranderings te gebruik moet jy sugar herbegin.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#: ../src/controlpanel/toolbar.py:121
-msgid "Ok"
-msgstr "Reg"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Waarskuwing"
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Veranderings het herbegin nodig"
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
-msgstr "Waarskuwing"
-
-#: ../src/controlpanel/gui.py:253
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Kanselleer veranderings"
 
-#: ../src/controlpanel/gui.py:257
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Later"
 
-#: ../src/controlpanel/gui.py:261
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Herbegin nou"
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
-msgstr "Jy moet 'n naam inskryf."
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Klaar"
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Reg"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "stroke:   %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Hou"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Uitwis"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Registreer"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Sleutel Tipe:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Geldigheidsverklaring Tipe:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Aangaan"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Aansluit"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "fill:     %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
-msgstr "Vout in gespesifiseerde kleure."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "Nie beskikbaar nie"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Weier"
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Jammer, ek praat nie '%s'."
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "Jy moet 'n bediener inskryf."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "Vout in radio waarde: gebruik on/off."
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
-msgstr "Omtrent My"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
-msgstr "Kliek om jou kleur te verander:"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
-msgstr "Omtrent my XO"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Verwyder"
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
-msgstr "Identiteit"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Maak oop"
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
-msgstr "Seriële Nommer:"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Maak oop met"
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
-msgstr "Sagteware"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
-msgstr "Bou:"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Buurt"
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
-msgstr "Fermware:"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "Datem & Tyd"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
-msgstr "Tydsone"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "Raam"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
-msgstr "nooit"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
-msgstr "dadelik"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Kliek om die kleur the verander:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Terug"
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Volgende"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "Titelloos"
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "Geen preview"
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%s seconds"
-msgstr "%s sekondes"
+msgid "Kind: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
-msgstr "Aktiveerings Vertraging"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
-msgstr "Hoekie"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
-msgstr "Snykant"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
-msgstr "Taal"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "Geen datum"
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "Deelnemers:"
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "Beskrywing:"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "Etikette:"
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "Joernaal"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Soek"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr "Enige Tyd"
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr "Vandag"
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr "Sedert gister"
+
+# TRANS: Filter entries modified during the last 7 days.
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr "Verlede week"
+
+# TRANS: Filter entries modified during the last 30 days.
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr "Verlede maand"
+
+# TRANS: Filter entries modified during the last 356 days.
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr "Verlede jaar"
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr "Enigiemand"
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr "My vriende"
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr "My klass"
+
+# TRANS: Item in a combo box that filters by entry type.
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr "Enigiets"
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
-msgstr "Netwerk"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
-msgstr "Draadloos"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
-msgstr "Radio:"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Begin"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
-msgstr "Bediener:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
-msgstr "Aan 'n Skool Mesh Portal gekoppel"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
-msgstr "Op soek na 'n Skool Mesh Portal..."
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
-msgstr "Aan 'n XO Mesh Portal gekoppel"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr "Jou joernaal is leeg"
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Op soek na 'n XO Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
-msgstr "Aan Eenvoudig Mesh gekoppel"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
-msgstr "Begin 'n Eenvoidige Mesh"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
-msgstr "Vreemde Mesh"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
-msgstr "Weier"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
-msgstr "Kontrole Paneel"
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
-msgstr "Herbegin"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr "Jou joernaal is leeg"
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "Kies 'n objek"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "Toemaak"
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Verwyder vriend"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Maak vriend"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "Uitskakel"
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
-msgstr "Registreer"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Herbegin"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Nooi na %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "Begin..."
 
-#: ../src/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/view/palettes.py:96
-msgid "Start"
-msgstr "Begin"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "Wys inhoud"
+
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Verwyder"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
 
-#: ../src/view/palettes.py:169
-msgid "Show contents"
-msgstr "Wys inhoud"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
 
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Knipbord objek: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Enkripsie Tipe:"
+
+#~ msgid "Disconnecting..."
+#~ msgstr "Ontkoppel..."
+
+#~ msgid "Disconnect..."
+#~ msgstr "Ontkoppel..."
+
+#~ msgid "You must enter a server."
+#~ msgstr "Jy moet 'n bediener inskryf."
+
+#~ msgid "About my XO"
+#~ msgstr "Omtrent my XO"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Aan 'n Skool Mesh Portal gekoppel"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Op soek na 'n Skool Mesh Portal..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Aan 'n XO Mesh Portal gekoppel"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Op soek na 'n XO Mesh Portal..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Aan Eenvoudig Mesh gekoppel"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Begin 'n Eenvoidige Mesh"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Vreemde Mesh"
+
+#~ msgid "Control Panel"
+#~ msgstr "Kontrole Paneel"
+
 #~ msgid "Remove from ring"
 #~ msgstr "Verwyder van ring"
 
diff --git a/po/am.po b/po/am.po
index a79e711..dc1edf1 100644
--- a/po/am.po
+++ b/po/am.po
@@ -2,419 +2,1737 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: 2011-09-27 17:27+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+#, fuzzy
+msgid "About Me"
+msgstr "ስለ እኔ"
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "ስም ግዴታ መግባት አለበት"
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "ቀለም ለመቀየር ተጫኑ፡"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "ማንነት"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "የመለያ ቁጥር"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "ቀንና ሠዐት"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "የሰዓት ክልል"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "በፍጹም"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "ጥግ"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "ጫፍ"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "ቋንቋ"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "ይቅርታ መናገር አልችልም '%s'።"
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr "ሚስጢራዊ ቃል፦"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr "ቍጥር፦"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "መረብ"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "ገመድ አልባ"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr "የባትሪውን ሀይል ለመቀነስ ገመድ አልባዉን ሬድዮ አጥፋው"
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "ሬድዮ"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
-msgid "Channel"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
-msgid "Group"
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
-msgid "Home"
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
-msgid "Activity"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "ሃይል"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "ሃይልን መቆጣጠሪያ"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "ጨርሻለሁ"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
-msgid "%s Activity"
+msgid "%.0f KB"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "ባትሪዬ"
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "አስወግደው"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "ባትሪው በመሞላት ላይ ነው"
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "በጣም ትንሽ የባትሪ ሀይል ቀርቶታል"
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d ቀርቶታል"
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "ባትሪው ተሞልቷል"
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr "የአይ ፒ አድራሻ ፡ %s"
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "አቋርጠው"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "እየተገናኘ ነው..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "ተገናኝቷል"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "ጣቢያ"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "አገናኝ"
+
+#: ../extensions/deviceicon/network.py:287
+#, fuzzy
+msgid "Disconnected"
+msgstr "አቋርጠው"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
 msgid "Cancel"
+msgstr "ተወው ሻር"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr "ስህተት :%s"
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "ቡድን"
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "ቤት"
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "ስራ"
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr "ሹገር የቁጥጥር ገበታ፡ ማሰጠንቀቂያ፣ ተመሳሳይ ስም ያላቸው ክአንድ በላይ ምርጫ ተገኝቷል፡ %s module: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "ሹገር የቁጥጥር ገበታ፡ ቁልፍ =%s ያልተገኘ ምርጫ"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "ሹገር የቁጥጥር ገበታ:%s"
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "የተለወጡትን ነገሮች ለመመልከት ሹገርን እንደገና  ማስጀመር አለብዎት።\n"
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "ማስጠንቀቂያ"
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr "የተለወጡትን ነገሮች ለመመልከት እንደገና ማስጀመር ያስፈልጋል"
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr "የተለወጡትን ነገሮች አጥፋ"
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "በኋላ"
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr "እንደገና አስጀምረዉ"
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "ጨርሻለሁ"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
+msgstr "እሺ"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr "ዝርያ %s"
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "እንዲጠፋ መፍቀድህን አረጋግጥ"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "እንዲጠፋ መፍቀድህን አረጋግጥ፡እስከመጨረሻው እንዲጠፋ ትፈልጋለህ %s?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "ማቆየት"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "አጥፋው"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "ምዝገባው አልተሳካም"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d year"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "ምዝገባዉ ተሳክቷል"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "መዝግበኝ"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "አሁን አረጋግጥ"
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "የዝርዝር እይታ"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "የተመረጡት እይታ"
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "የቁልፉ አይነት፡"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "የማረጋገጫ አይነት"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "ቀጥል"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "ተቀላቀል"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d month"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "ከአገልጋዩ ወይም ከተጠሪው ጋር መገናኘት አልቻልኩም።"
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "አገልጋዩ ወይም ተጠሪው ጥያቄዉን ለመፈፀም አልቻለም።"
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "አስወግደው"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "ክፈት"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "በዚህ ክፈተው"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "የጎረቤት እይታ"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "ስም፡"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "ቀለም ለመቀየር ተጫኑ፡"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "ወደ ኋላ ተመለስ"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "ቀጥል"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
+msgid "Kind: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr "ያልታወቀ"
+
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "መግለጫ፦"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "መጽሔት"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
-#, python-format
-msgid "Error copying timezone (from %s): %s"
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr "ስህተት"
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "ጀምር"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%(free_space)d MB Free"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
 msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "ጓደኛዬ አድርገው"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "አጥፋዉ"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "እንደገና አስጀምርዉ"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "ወደ እዚህ ጋብዘው %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "እየጀመረ ነዉ..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "አቁም"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "አስወግደው"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr "ምንጭ"
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Disconnect..."
+#~ msgstr "አቋርጠው..."
+
+#~ msgid "Cannot obtain data needed for registration."
+#~ msgstr "ለመመዝገብ የሚያስፈልገውን መረጃ አላገኘሁም።"
diff --git a/po/ay.po b/po/ay.po
index a79e711..b0faf7d 100644
--- a/po/ay.po
+++ b/po/ay.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/aym.po b/po/aym.po
new file mode 100644
index 0000000..94a2580
--- /dev/null
+++ b/po/aym.po
@@ -0,0 +1,2121 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: 2011-10-02 04:26+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: aym\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#  "Acerca de mí"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "nayatanayxata"
+
+#  "Debe ingresar un nombre."
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "sutiwa mantañapaxa"
+
+#  "borde:   color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#  "borde:   %s"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "qawaya   %s"
+
+#  "relleno:     color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#  "relleno:     %s"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "phuqa     %s"
+
+#  "Error en modificadores de color especificados."
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#  "Error en colores especificados."
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#  "Clic para cambiar su color:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#  "Acerca de mi computadora"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#  "No disponible"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#  "%(interface)s: %(version)s"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#  "Identidad"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#  "Número de serie:"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#  "Software"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#  "Ensamble:"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#  "Azúcar:"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#  "Firmware:"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#  "Firmware de la red inalámbrica:"
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#  "Licencia y derechos de autor"
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
+#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
+#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
+#  "se describen en ella."
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#  "Licencia completa:"
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#  "Fecha y hora"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#  "Error, zona horaria no existe."
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#  "Zona horaria"
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#  "Cuadro"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#  "El valor debe ser un número entero."
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#  "nunca"
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#  "instantáneo"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#  "%s segundos"
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#  "Retraso de activación"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#  "Esquina"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#  "Borde"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#  "Teclado"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#  "Modelo de teclado"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#  "Tecla(s) para cambiar el diseño"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#  "Diseño(s) de teclado"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#  "Idioma"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Aru"
+
+#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#  "El lenguaje del código=%s no pudo ser determinado."
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#  "Lo siento, yo no hablo '%s'."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+#  "disponible, se usará la siguiente en la lista."
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#  "Configuración del módem"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#  "Nombre de usuario:"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#  "Contraseña:"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#  "Número:"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#  "Nombre de punto de acceso (APN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#  "Número de identificación personal (PIN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#  "Clave personal de desbloqueo (PUK):"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#  "Necesitará proveer la información siguiente para configurar una conexión de "
+#  "banda ancha (3G) de red de telefonía celular."
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#  "Red"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#  "Estado desconocido."
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#  "Error en argumento especificado de radio use on/off."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#  "Error en argumento especificado use 0/1."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#  "Inalámbrica"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#  "Apague la radio inalámbrica y ahorre vida de batería"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#  "Radio"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#  "Descarte el historial de la red si tiene problemas de conexión"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#  "Descarte historial de la red"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#  "Colaboración"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
+#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#  "Servidor:"
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#  "Energía"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#  "Error en argumento automático de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#  "Error en argumento extremo de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#  "Manejo de energía"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#  "Manejo automático de energía (incrementa la vida de la batería)"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
+#  "duración de la batería)"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#  "Actualización de software"
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+#  "de seguridad y proveen nuevas características."
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#  "Probando %s..."
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#  "Descargando %s..."
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#  "Actualizando %s..."
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#  "Tu software esta actualizado"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#  "Puedes instalar %s actualización"
+#  "Puedes instalar %s actualizaciones"
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Buscando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#  "Instalando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#  "%s actualización fue instalada"
+#  "%s actualizaciones fueron instaladas"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Instalación seleccionada"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#  "Tamaño de descarga: %s"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#  "Ninguno"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#  "1 KB"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#  "%.0f KB"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#  "%.1f MB"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#  "Mi batería"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#  "Eliminado"
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#  "Cargando"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#  "Queda muy poca batería"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#  "Quedan %(hour)d:%(min).2d"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#  "Cargada"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "q'ipxaruta "
+
+#  "Direccion IP: %s"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#  "Desconectar"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#  "Conectando..."
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#  "Conectado"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#  "No hay conexión inalámbrica"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#  "Canal"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#  "Red Cableada"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#  "Velocidad"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#  "Módem inalámbrico"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#  "Espere por favor..."
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#  "Conectar"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#  "Desconectado"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#  "Cancelar"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#  "Probar la conexión nuevamente"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#  "Error: %s"
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#  "Sugerencia: %s"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#  "Conectado a %s"
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#  "%d KB"
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#  "Revise la configuración de su Pin/Puk."
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#  "Revise la configuración del nombre de su punto de acceso (APN)"
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#  "Revise el Número en la configuración."
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#  "Revise su configuración."
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#  "Red Malla"
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#  "Red Malla %s"
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#  "No se dispone de conexión GSM."
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#  "Crear una conexión en el panel de control."
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#  "Mis parlantes"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#  "Dar voz"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#  "Silenciar"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#  "dedo"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#  "estilo"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#  "Mi superficie táctil"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#  "Malla"
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#  "Grupo"
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#  "Hogar"
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#  "Actividad"
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#  "Captura de pantalla"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#  "Captura pantalla de \"%s\""
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
+#  "para reutilizar el nombre largo de la cuenta UNIX."
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#  "Directorios adicionales que pueden contener traducciones actualizadas."
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#  "URL de Respaldo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#  "Bundle IDs de actividades protegidas"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
+#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
+#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#  "Retraso de las Esquinas"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#  "Tipo de letra predeterminado"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#  "Tamaño de letra predeterminado"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#  "Apodo predeterminado"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando las esquinas."
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando los bordes."
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#  "Directorio a buscar para traducciones"
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#  "Retraso del Borde"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#  "Diseño de favoritos"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#  "Modo de reanudar favoritos"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#  "Tipo de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#  "Tamaño de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#  "APN de la red GSM"
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#  "PIN de la red GSM"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#  "PUK de la red GSM"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#  "Número de la red GSM"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#  "Contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#  "Configuración de la contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#  "Configuración del numero de identificación personal (PIN) de la red GSM"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#  "Configuración del número de teléfono de la red GSM"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#  "Nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#  "Configuración del nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
+#  "Jabber."
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
+#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
+#  "automáticamente a una red ad-hoc."
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#  "Servidor Jabber"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#  "Distribuciones del teclado"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#  "Modelo del teclado"
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#  "Opciones del teclado"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#  "Distribución de las actividades favoritas."
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
+#  "distribución(variante)"
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#  "Lista de las opciones del teclado."
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#  "Manejo automática de energía"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#  "Manejo automática de energía."
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#  "Manejo extremo de energía"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#  "Manejo extremo de energía."
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#  "Publicar en Gadget"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#  "Configuración para silenciar el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#  "Mostrar Terminar Sesión"
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#  "Mostrar Reiniciar"
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#  "Mostrar redes específicas de Azúcar"
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#  "Sonido silenciado"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#  "El modelo del teclado que se utilizará"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#  "Configuración de zona horaria para el sistema."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#  "URL del servidor de Jabber para usar."
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#  "URL donde se guarda el backup."
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#  "Color del usuario"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#  "Nombre de usuario"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#  "Nombre de usuario que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
+#  "lista."
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#  "Nivel de volumen"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#  "Nivel de volumen para el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
+#  "que se retome la última entrada de esa actividad."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
+#  "módulo %s: %r"
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#  "sugar-control-panel: clave=%s no es una opción disponible"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#  "sugar-control-panel: %s"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
+#  "    Control para el ambiente de sugar. \n"
+#  "    Opciones: \n"
+#  "    -h               muestra este mensaje de ayuda y sale \n"
+#  "    -l                enumera todas las opciones disponibles \n"
+#  "    -h clave       muestra la información sobre esta clave \n"
+#  "    -g clave       obtiene el valor actual de la clave \n"
+#  "    -s clave       establece el valor actual de la clave \n"
+#  "    -c clave  vaciar el valor actual de la clave \n"
+#  "    "
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#  "Advertencia"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#  "Los cambios requieren reiniciar"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#  "Cancelar cambios"
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#  "Después"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#  "Reiniciar ahora"
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#  "Hecho"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#  "Versión %s"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#  "Confirmar borrado"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#  "Guardar"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Imaña"
+
+#  "Borrar"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#  "Remover favorito"
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#  "Hacer favorito"
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#  "Forma libre"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#  "Anillo"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#  "Espiral"
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#  "Caja"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#  "Triángulo"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#  "Error al registrar"
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#  "%s"
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#  "Registro exitoso"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#  "Ahora estás registrado en el servidor de colegio."
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#  "Registro"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#  "Registrar nuevamente"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#  "Actualización de Software"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#  "Pruebe ahora"
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#  "Vista en lista"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#  "<Ctrl>2"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#  "Vista de favoritos"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#  "<Ctrl>1"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#  "Tipo de clave:"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#  "Tipo de autenticación:"
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#  "WPA y WPA2 Personal"
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#  "Seguridad inalámbrica:"
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#  "Retomar"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#  "Unirse"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#  "Red específica %d"
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#  "Red Malla %d"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#  "No se puede conectar al servidor."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#  "El servidor no pudo completar el pedido."
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#  "Rechazar"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#  "%dB"
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#  "%dKB"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#  "%dMB"
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#  "%s de %s"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#  "Transferencia desde %s"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#  "%s (%s)"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#  "Descartar"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#  "El otro participante canceló la transferencia del archivo"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#  "Transferir a %s"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#  "Eliminar"
+#  SYNTAX ERROR: msgctxt "Clipboard"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgid "Remove"
+msgstr ""
+
+#  "Abrir"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#  "Abrir con"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#  "recorte de %s"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#  "Vecindario"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#  "F1"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#  "F2"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#  "F3"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#  "F4"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#  "Nombre:"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Suti:"
+
+#  "Clic para cambiar de color:"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#  "Atrás"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#  "Siguiente"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#  "Sin título"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#  "Sin vista previa"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#  "Tipo: %s"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#  "Desconocido"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#  "Fecha: %s"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#  "Tamaño: %s"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#  "Sin fecha"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#  "Participantes:"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#  "Descripción:"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#  "Etiquetas:"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#  "Diario"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#  "Buscar"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#  "Cualquier momento"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#  "Hoy"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#  "Desde ayer"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#  "Última semana"
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#  "Último mes"
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#  "Último año"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#  "Mis amigos"
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#  "Mi clase"
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#  "Copiar a"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#  "Duplicar"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#  "Error mientras se copiaba la entrada. %s"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#  "Error"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#  "Iniciar"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#  "Ordenar por fecha de modificación"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#  "Ordenar por fecha de creación"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#  "Ordenar por tamaño"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#  "Ordenar vista"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#  "Su diario está vacío"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#  "Tu carpeta de documentos está vacía"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#  "El dispositivo está vacío"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#  "No hay entradas coincidentes"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#  "Limpiar búsqueda"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#  "Versión más antigua de la actividad %s"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#  "¿Desea instalar la versión %s, mas antigua?    "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#  "Su diario está lleno"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
+#  "nuevas entradas."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#  "Mostrar diario"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#  "Escoja un objeto"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#  "Cerrar"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#  "Reiniciar con"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#  "Empezar con"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#  "No se encontró una actividad para iniciar la entrada"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#  "Enviar a"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#  "Ver detalles"
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#  "Las entradas sin un archivo no pueden ser enviadas."
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#  "Entradas sin un archivo no pueden ser copiadas."
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#  "Portapapeles"
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#  "No hay amigos presentes"
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#  "No se encontró una conexión válida"
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#  "No se encontró una actividad para retomar la entrada"
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#  "Documentos"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#  "%(free_space)d MB libres"
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#  "La razón para el cambio de estado del dispositivo es desconocida."
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#  "El cambio de estado es normal."
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#  "El dispositivo está siendo administrado."
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#  "El dispositivo ya no está siendo administrado."
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#  "El dispositivo no pudo ser preparado para su configuración."
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
+#  "tiempo fuera, etc)."
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#  "La configuración IP ya no es válida."
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#  "Claves requeridas, pero no fueron suministradas."
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
+#  "autenticación."
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#  "Configuración del cliente 802.1X fallada."
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio PPP se ha desconectado inesperadamente."
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#  "El servicio PPP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio DHCP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio DHCP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio de conexión compartida ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio AutoIP ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#  "El servicio AutoIP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#  "Conexión fallada porque la línea estaba ocupada."
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#  "Conexión fallada porque no había tono de llamada."
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#  "Conexión fallada porque no había portadora."
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#  "Llamada expiró por tiempo."
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#  "Llamada falló."
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#  "Fallo en inicialización de modem."
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#  "Fallo al seleccionar el punto de acceso (APN) GSM"
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#  "No se buscan redes."
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#  "Registración en la red fué rechazada."
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#  "Registración en la red expiró."
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#  "Falló la registración con la red GSM solicitada."
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#  "Control de PIN fallado."
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#  "Firmware necesario para el dispositivo puede faltar."
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#  "El dispositivo fué quitado."
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#  "NetworkManager fue dormido."
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#  "Un usuario o cliente solicitó la desconexión."
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#  "La portadora/link del dispositivo a cambiado."
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#  "Remover amigo"
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#  "Agregar amigo"
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#  "Apagar"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#  "Reiniciar"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#  "Salir"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#  "Mis ajustes"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#  "Invitar a %s"
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#  "<b>%s</b> falló al iniciar."
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#  "Iniciando..."
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#  "Actividad falló al iniciar"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#  "Ver fuente"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#  "Parar"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#  "Empezar nuevo"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#  "Mostrar contenidos"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#  "Eliminar"
+#  SYNTAX ERROR: msgctxt "Volume"
+#: ../src/jarabe/view/palettes.py:229
+msgid "Remove"
+msgstr ""
+
+#  "Fuente de la instancia"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#  "Fuente"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#  "Fuente del paquete de la actividad"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#  "Fuente del paquete SugarToolkit"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#  "Ver código fuente: %r"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#  "Sugar en una ventana"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 6f1700a..7ac2211 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-09 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-03-01 13:14-0500\n"
 "Last-Translator: Alexander Todorov <atodorov@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,412 +15,881 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../src/intro/intro.py:67
-msgid "Name:"
-msgstr "Име:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../src/intro/intro.py:96
-msgid "Click to change color:"
-msgstr "Натиснете, за да смените цвета:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
 
-#: ../src/intro/intro.py:146
-msgid "Back"
-msgstr "Назад"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../src/intro/intro.py:160
-msgid "Done"
-msgstr "Затваряне"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../src/intro/intro.py:163
-msgid "Next"
-msgstr "Следващ"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "Изтриване на приятел"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "Създаване на приятел"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Грешка в зададените цветови модификатори."
 
-#: ../src/view/BuddyMenu.py:84
-#, python-format
-msgid "Invite to %s"
-msgstr "Покани в %s"
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Грешка в зададените цветове."
 
-#: ../src/view/clipboardmenu.py:58
-msgid "Remove"
-msgstr "Премахване"
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
+msgstr "Натиснете, за да смените цвета:"
 
-#: ../src/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "Отваряне"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:73
-msgid "Add to journal"
-msgstr "Добави към дневника"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Не е наличен"
 
-#: ../src/view/clipboardmenu.py:213
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Обект в паметта: %s."
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "Тип ключ:"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "Тип удостоверяване:"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "Вид криптиране:"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "Стартиране..."
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:104 ../src/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "Продължаване"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:111
-msgid "Stop"
-msgstr "Стоп"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
 
-#: ../src/view/Shell.py:285
-msgid "Screenshot"
-msgstr "Снимка на екрана"
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "Рестартиране"
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "Изключване"
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "Регистриране"
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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:90 ../src/view/home/MeshBox.py:197
-#: ../src/view/devices/network/wireless.py:113
-#: ../src/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "Отделяне..."
-
-#: ../src/view/home/MeshBox.py:195 ../src/view/devices/network/mesh.py:37
-#: ../src/view/devices/network/mesh.py:62
-#: ../src/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "Mesh мрежа"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "Присъединяване"
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Грешка, времевата зона не съществува."
 
-#: ../src/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "Статус на батерията"
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
 
-#: ../src/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "Батерията се зарежда"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
 
-#: ../src/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "Батерията се разрежда"
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
 
-#: ../src/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "Батерията е напълно заредена"
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:61
-msgid "Disconnected"
-msgstr "Без свързаност"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:131
-msgid "Channel"
-msgstr "Канал"
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d секунди"
 
-# взето от руския превод
-#: ../src/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "Съседи"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:54
-msgid "Group"
-msgstr "Група"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:66
-msgid "Home"
-msgstr "Начало"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:78
-msgid "Activity"
-msgstr "Дейност"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "Сподели с:"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "Личен"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "Моите съседи"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "Запазване"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "Отмяна"
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Отказан е достъп до %s. Моля, създайте стандартни настойки."
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "Възстановяване"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "Не може да бъде определен езикът с код=%s."
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "Копиране"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Съжалявам, но не говоря '%s'."
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "Поставяне"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
-#, python-format
-msgid "%s Activity"
-msgstr "%s занятие"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "Грешка при запис"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "Грешка при запис: всички промени ще бъдат изгубени"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "Без спиране"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "Спиране винаги"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "Отказ"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
-msgid "Ok"
-msgstr "Ок"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "Продължение"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "Добре"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
-#, python-format
-msgid "%d year"
-msgstr "%d година"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Непознато състояние."
 
-#: ../lib/sugar/graphics/objectchooser.py:175
-#, python-format
-msgid "%d years"
-msgstr "%d години"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Грешка в зададения аргумент, използвайте вкл/изкл."
 
-#: ../lib/sugar/graphics/objectchooser.py:176
-#, python-format
-msgid "%d month"
-msgstr "%d месец"
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "Грешка в зададения аргумент, използвайте вкл/изкл."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "%d months"
-msgstr "%d месеца"
+msgid "Checking %s..."
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
-msgid "%d week"
-msgstr "%d седмица"
+msgid "Downloading %s..."
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
-msgid "%d weeks"
-msgstr "%d седмици"
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
-msgid "%d day"
-msgstr "%d ден"
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
-msgid "%d days"
-msgstr "%d дни"
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
-msgid "%d hour"
-msgstr "%d час"
+msgid "Download size: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "%d hours"
-msgstr "%d часа"
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Затваряне"
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
-msgid "%d minute"
-msgstr "%d минута"
+msgid "%.0f KB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
-msgid "%d minutes"
-msgstr "%d минути"
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Премахване"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
-msgid "%d second"
-msgstr "%d секунда"
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../extensions/deviceicon/network.py:49
 #, python-format
-msgid "%d seconds"
-msgstr "%d секунди"
+msgid "IP address: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr " и "
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
+msgstr "Без свързаност"
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr ", "
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
 
-#: ../src/controlpanel/control.py:219
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Моля, рестартирайте графичната среда, за да влязат в сила промените.\n"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
 
-#: ../src/controlpanel/control.py:273
-msgid "Error in specified color modifiers."
-msgstr "Грешка в зададените цветови модификатори."
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
 
-#: ../src/controlpanel/control.py:276
-msgid "Error in specified colors."
-msgstr "Грешка в зададените цветове."
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Канал"
 
-#: ../src/controlpanel/control.py:312
-msgid "off"
-msgstr "изключен"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
 
-#: ../src/controlpanel/control.py:314
-msgid "on"
-msgstr "включен"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
 
-#: ../src/controlpanel/control.py:316
-msgid "State is unknown."
-msgstr "Непознато състояние."
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
 
-#: ../src/controlpanel/control.py:336
-msgid "Error in specified radio argument use on/off."
-msgstr "Грешка в зададения аргумент, използвайте вкл/изкл."
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
 
-#: ../src/controlpanel/control.py:340
-msgid "Permission denied. You need to be root to run this method."
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
 msgstr ""
-"Отказано е позволение. Трябва да сте администратор, за да изпълните този "
-"метод."
 
-#: ../src/controlpanel/control.py:370
-msgid "Error in reading timezone"
-msgstr "Грешка при прочитане на времева зона"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Без свързаност"
 
-#: ../src/controlpanel/control.py:401
-#, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "Грешка при копиране на времева зона (от %s): %s"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Отказ"
 
-#: ../src/controlpanel/control.py:406
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "Замяна на позволенията за времева зона: %s"
+msgid "Error: %s"
+msgstr ""
 
-#: ../src/controlpanel/control.py:416
-msgid "Error timezone does not exist."
-msgstr "Грешка, времевата зона не съществува."
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
 
-#: ../src/controlpanel/control.py:421 ../src/controlpanel/control.py:440
+#: ../extensions/deviceicon/network.py:349
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "Отказан е достъп до %s. Моля, създайте стандартни настойки."
+msgid "Connected for %s"
+msgstr ""
 
-#: ../src/controlpanel/control.py:467
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "Не може да бъде определен езикът с код=%s."
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Mesh мрежа"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "Mesh мрежа"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
 
-#: ../src/controlpanel/control.py:477
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "Група"
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "Начало"
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "Дейност"
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Снимка на екрана"
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Съжалявам, но не говоря '%s'."
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "Свързан към училищният Mash портал"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "Търсене на училищем Mesh портал..."
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "Свързан към Mesh мрежа от лаптопи XO"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Търсене на Mesh мрежа от лаптопи XO..."
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "Свързан към обикновенна Mesh мрежа"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "Стартиране на обикновенна Mesh мрежа"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "Непозната Mesh мрежа"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:175 ../src/view/home/HomeBox.py:216
-msgid "About this XO"
-msgstr "Относно този лаптоп"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:222
-msgid "Not available"
-msgstr "Не е наличен"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
 
-#: ../src/controlpanel/cmd.py:27
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: ключ=%s - непозволена опция"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -430,6 +899,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Използване: sugar-control-panel [ опции ] ключ [ аргументи ... ] \n"
@@ -442,13 +912,995 @@ msgstr ""
 "    -s ключ       задаване на нова стойност на ключа \n"
 "    "
 
-#: ../src/controlpanel/cmd.py:55 ../src/controlpanel/cmd.py:67
-#: ../src/controlpanel/cmd.py:74
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Моля, рестартирайте графичната среда, за да влязат в сила промените.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Затваряне"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Ок"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr "sugar-control-panel: ключ=%s - непозволена опция"
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../src/controlpanel/cmd.py:80
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "sugar-control-panel: %s"
-msgstr "sugar-control-panel: %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Запазване"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Регистриране"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Тип ключ:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Тип удостоверяване:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Продължаване"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Присъединяване"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Mesh мрежа"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Премахване"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Отваряне"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+# взето от руския превод
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Съседи"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Име:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Натиснете, за да смените цвета:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Следващ"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Изтриване на приятел"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Създаване на приятел"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Изключване"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Покани в %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Стартиране..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Стоп"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Премахване"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "Добави към дневника"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Обект в паметта: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Вид криптиране:"
+
+#~ msgid "Reboot"
+#~ msgstr "Рестартиране"
+
+#~ msgid "Disconnect..."
+#~ msgstr "Отделяне..."
+
+#~ msgid "My Battery life"
+#~ msgstr "Статус на батерията"
+
+#~ msgid "Battery charging"
+#~ msgstr "Батерията се зарежда"
+
+#~ msgid "Battery discharging"
+#~ msgstr "Батерията се разрежда"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "Батерията е напълно заредена"
+
+#~ msgid "Share with:"
+#~ msgstr "Сподели с:"
+
+#~ msgid "Private"
+#~ msgstr "Личен"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "Моите съседи"
+
+#~ msgid "Undo"
+#~ msgstr "Отмяна"
+
+#~ msgid "Redo"
+#~ msgstr "Възстановяване"
+
+#~ msgid "Copy"
+#~ msgstr "Копиране"
+
+#~ msgid "Paste"
+#~ msgstr "Поставяне"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s занятие"
+
+#~ msgid "Keep error"
+#~ msgstr "Грешка при запис"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "Грешка при запис: всички промени ще бъдат изгубени"
+
+#~ msgid "Don't stop"
+#~ msgstr "Без спиране"
+
+#~ msgid "Stop anyway"
+#~ msgstr "Спиране винаги"
+
+#~ msgid "Continue"
+#~ msgstr "Продължение"
+
+#~ msgid "OK"
+#~ msgstr "Добре"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d година"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d години"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d месец"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d месеца"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d седмица"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d седмици"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d ден"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d дни"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d час"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d часа"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d минута"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d минути"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d секунда"
+
+#~ msgid " and "
+#~ msgstr " и "
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "off"
+#~ msgstr "изключен"
+
+#~ msgid "on"
+#~ msgstr "включен"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr ""
+#~ "Отказано е позволение. Трябва да сте администратор, за да изпълните този "
+#~ "метод."
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "Грешка при прочитане на времева зона"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "Грешка при копиране на времева зона (от %s): %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "Замяна на позволенията за времева зона: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Свързан към училищният Mash портал"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Търсене на училищем Mesh портал..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Свързан към Mesh мрежа от лаптопи XO"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Търсене на Mesh мрежа от лаптопи XO..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Свързан към обикновенна Mesh мрежа"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Стартиране на обикновенна Mesh мрежа"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Непозната Mesh мрежа"
+
+#~ msgid "About this XO"
+#~ msgstr "Относно този лаптоп"
diff --git a/po/bi.po b/po/bi.po
index 63d4e34..7fd0d5d 100644
--- a/po/bi.po
+++ b/po/bi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 45ede9f..050df5b 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Update 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2007-12-23 10:33+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan229@gmail.com>\n"
 "Language-Team: Bengali <core@bengalinux.org>\n"
@@ -15,405 +15,1879 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "নাম:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "উল্লেখিত রং পরিবর্তকে ত্রুটি।"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "উল্লেখিত রং এ ত্রুটি।"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "রং পরিবর্তন করতে ক্লিক:"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "পেছনে"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "করা হয়েছে"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "পাওয়া যায় নি"
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "পরবর্তী"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "বন্ধু মোছো"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "বন্ধু বানাও"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "ত্রুটিযুক্ত সময় জোনের অস্তিত্ব নেই।"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d সেকেন্ড"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "%s এ প্রবেশ করতে পারে নি। প্রমাণ মানসমূহ তৈরি করো।"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Invite to %s"
-msgstr "%s কে নিমণ্ত্রণ"
+msgid "Language for code=%s could not be determined."
+msgstr "কোড=%s এর জন্য কোন ভাষা নির্ধারণ করা যায় নি।"
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
-msgstr "মোছো"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "দুঃখিত আমি '%s' বলতে পারি না।"
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "খোলো"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "অবস্থানটি অজানা।"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার on/off তে ত্রুটি।"
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার on/off তে ত্রুটি।"
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "জার্নালে লেখ"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "ক্লীপবোর্ড বস্তু: %s।"
+msgid "Checking %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "কী ধরণ:"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "পরিচয় প্রমানের ধরণ:"
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "এনক্রিপশন ধরণ:"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "শুরু হচ্ছে..."
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "পুনরায় শুরু করুন"
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "থামাও"
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
-msgstr "স্ক্রীণশট"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "পুনরায় চালু"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "বন্ধ করো"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "রেজিস্টার"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "সংযোগ বিচ্ছিন্ন..."
-
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "মেশ নেটওয়ার্ক"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "করা হয়েছে"
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "যোগ দাও"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "আমার ব্যাটারীর জীবনসীমা"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "ব্যাটারী চার্জ হচ্ছে"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "ব্যাটারী চার্জ কমে যাচ্ছে"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "ব্যাটারী পুরোপুরি চার্জ হয়েছে"
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "মোছো"
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "চ্যানেল"
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "ছোটবেলা"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "সংযোগ বিচ্ছিন্ন"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "বাতিল"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "মেশ নেটওয়ার্ক"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "মেশ নেটওয়ার্ক"
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "দল"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "বাড়ি"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "সক্রিয়তা"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "ভাগাভাগি করো:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "স্ক্রীণশট"
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "ব্যাক্তিগত"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "আমার ছেলেবেলা"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "রাখো"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "বাতিল করো"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "আবার করো"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "কপি"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "সাঁটো"
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
-msgstr "%s সক্রিয়তা"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "ত্রুটি রেখে দাও"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "ত্রুটি রেখে দাও: সব পরিবর্তন হারিয়ে যাবে"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "থামিও না"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "যে কোন ভাবে থামো"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "তোমার পরিবর্তন কার্যকর করার জন্য সুগার পুনরায় চালু করতে হবে।\n"
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "বাতিল"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "করা হয়েছে"
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "এগিয়ে যাও"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "ঠিক আছে"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d বছর"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "রাখো"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
-msgstr "%d বছর"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "রেজিস্টার"
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "কী ধরণ:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "পরিচয় প্রমানের ধরণ:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "পুনরায় শুরু করুন"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "যোগ দাও"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "মেশ নেটওয়ার্ক"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d month"
-msgstr "%d মাস"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d months"
-msgstr "%d মাস"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d week"
-msgstr "%d সপ্তাহ"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d weeks"
-msgstr "%d সপ্তাহ"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d day"
-msgstr "%d দিন"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d days"
-msgstr "%d দিন"
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hour"
-msgstr "%d ঘন্টা"
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "মোছো"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "খোলো"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d hours"
-msgstr "%d ঘন্টা"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "ছোটবেলা"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "নাম:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "রং পরিবর্তন করতে ক্লিক:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "পেছনে"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "পরবর্তী"
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minute"
-msgstr "%d মিনিট"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d minutes"
-msgstr "%d মিনিট"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d second"
-msgstr "%d সেকেন্ড"
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%d seconds"
-msgstr "%d সেকেন্ড"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr " এবং "
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr ", "
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "তোমার পরিবর্তন কার্যকর করার জন্য সুগার পুনরায় চালু করতে হবে।\n"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "উল্লেখিত রং পরিবর্তকে ত্রুটি।"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "উল্লেখিত রং এ ত্রুটি।"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "off"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "on"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "অবস্থানটি অজানা।"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
-msgstr "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার on/off তে ত্রুটি।"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
-msgstr "অনুমতি প্রত্যাখ্যাত। এই পন্থাটি চালাতে তোমাকে root হিসেবে কাজ করতে হবে।"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "সময় জোন পড়তে ত্রুটি"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "সময় জোন (%s হতে) কপি করায় ত্রুটি: %s"
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "সময় জোনের অনুমতি পরিবর্তন: %s"
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "ত্রুটিযুক্ত সময় জোনের অস্তিত্ব নেই।"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "%s এ প্রবেশ করতে পারে নি। প্রমাণ মানসমূহ তৈরি করো।"
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "বন্ধু মোছো"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "বন্ধু বানাও"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "বন্ধ করো"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "কোড=%s এর জন্য কোন ভাষা নির্ধারণ করা যায় নি।"
+msgid "Invite to %s"
+msgstr "%s কে নিমণ্ত্রণ"
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "দুঃখিত আমি '%s' বলতে পারি না।"
+msgid "<b>%s</b> failed to start."
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "একটি স্কুলের মেশ পোর্টালে সংযুক্ত"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "শুরু হচ্ছে..."
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "একটি স্কুল মেশ পোর্টাল খুজছি..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "একটি জো(XO) মেশ পোর্টালে সংযুক্ত"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "একটি জো(XO) মেশ পোর্টাল খুজছি..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "থামাও"
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "একটি সাধারণ মেশ এ সংযুক্ত"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "একটি সাধারণ মেশ চালু করছি"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "অজানা মেশ"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "মোছো"
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
-msgstr "XO সম্বন্ধে"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
-msgstr "পাওয়া যায় নি"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "জার্নালে লেখ"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "ক্লীপবোর্ড বস্তু: %s।"
+
+#~ msgid "Encryption Type:"
+#~ msgstr "এনক্রিপশন ধরণ:"
+
+#~ msgid "Reboot"
+#~ msgstr "পুনরায় চালু"
+
+#~ msgid "Disconnect..."
+#~ msgstr "সংযোগ বিচ্ছিন্ন..."
+
+#~ msgid "My Battery life"
+#~ msgstr "আমার ব্যাটারীর জীবনসীমা"
+
+#~ msgid "Battery charging"
+#~ msgstr "ব্যাটারী চার্জ হচ্ছে"
+
+#~ msgid "Battery discharging"
+#~ msgstr "ব্যাটারী চার্জ কমে যাচ্ছে"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "ব্যাটারী পুরোপুরি চার্জ হয়েছে"
+
+#~ msgid "Share with:"
+#~ msgstr "ভাগাভাগি করো:"
+
+#~ msgid "Private"
+#~ msgstr "ব্যাক্তিগত"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "আমার ছেলেবেলা"
+
+#~ msgid "Undo"
+#~ msgstr "বাতিল করো"
+
+#~ msgid "Redo"
+#~ msgstr "আবার করো"
+
+#~ msgid "Copy"
+#~ msgstr "কপি"
+
+#~ msgid "Paste"
+#~ msgstr "সাঁটো"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s সক্রিয়তা"
+
+#~ msgid "Keep error"
+#~ msgstr "ত্রুটি রেখে দাও"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "ত্রুটি রেখে দাও: সব পরিবর্তন হারিয়ে যাবে"
+
+#~ msgid "Don't stop"
+#~ msgstr "থামিও না"
+
+#~ msgid "Stop anyway"
+#~ msgstr "যে কোন ভাবে থামো"
+
+#~ msgid "Continue"
+#~ msgstr "এগিয়ে যাও"
+
+#~ msgid "OK"
+#~ msgstr "ঠিক আছে"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d বছর"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d বছর"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d মাস"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d মাস"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d সপ্তাহ"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d সপ্তাহ"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d দিন"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d দিন"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d ঘন্টা"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d ঘন্টা"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d মিনিট"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d মিনিট"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d সেকেন্ড"
+
+#~ msgid " and "
+#~ msgstr " এবং "
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "off"
+#~ msgstr "off"
+
+#~ msgid "on"
+#~ msgstr "on"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "অনুমতি প্রত্যাখ্যাত। এই পন্থাটি চালাতে তোমাকে root হিসেবে কাজ করতে হবে।"
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "সময় জোন পড়তে ত্রুটি"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "সময় জোন (%s হতে) কপি করায় ত্রুটি: %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "সময় জোনের অনুমতি পরিবর্তন: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "একটি স্কুলের মেশ পোর্টালে সংযুক্ত"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "একটি স্কুল মেশ পোর্টাল খুজছি..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "একটি জো(XO) মেশ পোর্টালে সংযুক্ত"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "একটি জো(XO) মেশ পোর্টাল খুজছি..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "একটি সাধারণ মেশ এ সংযুক্ত"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "একটি সাধারণ মেশ চালু করছি"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "অজানা মেশ"
+
+#~ msgid "About this XO"
+#~ msgstr "XO সম্বন্ধে"
diff --git a/po/ca.po b/po/ca.po
index a9ab315..cda40cb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # revisar
-#, python-format
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-01-14 17:19+0000\n"
 "Last-Translator: Jaume <jaume@nualart.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,422 +16,1892 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "Nom:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Error en els modificadors de color especificats"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Error en els colors especificats"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "Clic per a canviar de color:"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Enrere"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "Fet"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "No disponible"
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "Següent"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "Esborrar amic/ga"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "Fer amic/ga"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Error: aquesta zona horària no existeix"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d segons"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "No es pot accedir a %s. Crea una configuració estàndar."
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Invite to %s"
-msgstr "Convidar a %s"
+msgid "Language for code=%s could not be determined."
+msgstr "La llengua que té com a codi code=%s no es pot determinar."
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Ho sento, no parlo '%s'."
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Status deconegut"
+
+#  dubtes:
+# 1- manca una coma al text original
+# 2- He posat on/off
+#: ../extensions/cpsection/network/model.py:99
+#, fuzzy
+msgid "Error in specified radio argument use on/off."
+msgstr "Error en l'argument de ràdio especificat, useu on/off"
+
+# dubtes:
+# 1- manca una coma al text original
+# 2- He posat on/off
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "Error en l'argument de ràdio especificat, useu on/off"
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Fet"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
 msgstr "Eliminar"
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "Obrir"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "Afegir al diari"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Objecte del porta-retalls: %s"
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "Tipus de clau:"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "Tipus d'autentificació:"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "Tipus d'encriptació:"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
+msgstr "Desconnectat"
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "Arrencant ..."
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "Reprendre"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "Aturar"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
-msgstr "Captura de pantalla"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Canal"
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "Reiniciar"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "Aturar"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "Registre"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Desconnectat"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "Desconnecta ..."
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
 
 # Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-#: ../src/view/home/MeshBox.py:195
-#: ../src/view/devices/network/mesh.py:37
-#: ../src/view/devices/network/mesh.py:62
-#: ../src/view/devices/network/mesh.py:66
+#: ../extensions/deviceicon/network.py:612
 #, fuzzy
 msgid "Mesh Network"
 msgstr "Xarxa Mesh"
 
-# mmm, potser més simple?
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "Uneix-t'hi"
+# Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+#, fuzzy
+msgid "Mesh Network %s"
+msgstr "Xarxa Mesh"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "Vida de la bateria"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "Carregant bateria"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "Descarregant bateria"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "Bateria plena"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
-msgstr "Desconnectat"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
-msgid "Channel"
-msgstr "Canal"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-# aquí cal pensar si es millorÑ barri, veinatge, maquines veines,....
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "Veïns"
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Grup"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Inici"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Activitat"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "Compartir amb:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Captura de pantalla"
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "Privat"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "Els meus veïns"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "Desfer"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "Refer"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "Copia"
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "Enganxa"
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
-msgid "%s Activity"
-msgstr "%s Activitat"
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
 
-# revisar
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "Manté l'error"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "Manté l'error: tots els canvis es perdran"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "No t'aturis"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Per aplicar els canvis, cal que reiniciar el sugar.\n"
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "Cancel·lar"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Fet"
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "Continuar"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "D'acord"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Registre"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Tipus de clau:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Tipus d'autentificació:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Reprendre"
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+# mmm, potser més simple?
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Uneix-t'hi"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d year"
-msgstr "%d any"
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+# Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d years"
-msgstr "%d anys"
+#, fuzzy
+msgid "Mesh Network %d"
+msgstr "Xarxa Mesh"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d month"
-msgstr "%d mes"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d months"
-msgstr "%d mesos"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d week"
-msgstr "%d setmana"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d weeks"
-msgstr "%d setmanes"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d day"
-msgstr "%d dia"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d days"
-msgstr "%d dies"
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hour"
-msgstr "%d hora"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Obrir"
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d hours"
-msgstr "%d hores"
+msgid "%s clipping"
+msgstr ""
+
+# aquí cal pensar si es millorÑ barri, veinatge, maquines veines,....
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Veïns"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Clic per a canviar de color:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Enrere"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Següent"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minute"
-msgstr "%d minut"
+msgid "Kind: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d minutes"
-msgstr "%d minuts"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d second"
-msgstr "%d segon"
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%d seconds"
-msgstr "%d segons"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr "i"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr ","
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Per aplicar els canvis, cal que reiniciar el sugar.\n"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "Error en els modificadors de color especificats"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "Error en els colors especificats"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "apagar"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "arrancar"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "Status deconegut"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#  dubtes:
-# 1- manca una coma al text original
-# 2- He posat on/off
-#: ../shell/controlpanel/control.py:332
-#: ../src/controlpanel/control.py:336
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Esborrar amic/ga"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Fer amic/ga"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Aturar"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Convidar a %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Arrencant ..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Aturar"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
 #, fuzzy
-msgid "Error in specified radio argument use on/off."
-msgstr "Error en l'argument de ràdio especificat, useu on/off"
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Eliminar"
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
-msgstr "Permís denegat: cal que ser root per aquesta operació"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "Error en llegir la zona horària"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "Error en copiar la zona horària (des de %s): %s"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "Afegir al diari"
 
-#: ../shell/controlpanel/control.py:402
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "Canviant permisos de zona horària: %s"
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Objecte del porta-retalls: %s"
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "Error: aquesta zona horària no existeix"
+#~ msgid "Encryption Type:"
+#~ msgstr "Tipus d'encriptació:"
+
+#~ msgid "Reboot"
+#~ msgstr "Reiniciar"
+
+#~ msgid "Disconnect..."
+#~ msgstr "Desconnecta ..."
+
+#~ msgid "My Battery life"
+#~ msgstr "Vida de la bateria"
+
+#~ msgid "Battery charging"
+#~ msgstr "Carregant bateria"
+
+#~ msgid "Battery discharging"
+#~ msgstr "Descarregant bateria"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "Bateria plena"
+
+#~ msgid "Share with:"
+#~ msgstr "Compartir amb:"
+
+#~ msgid "Private"
+#~ msgstr "Privat"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "Els meus veïns"
+
+#~ msgid "Undo"
+#~ msgstr "Desfer"
+
+#~ msgid "Redo"
+#~ msgstr "Refer"
+
+#~ msgid "Copy"
+#~ msgstr "Copia"
+
+#~ msgid "Paste"
+#~ msgstr "Enganxa"
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "No es pot accedir a %s. Crea una configuració estàndar."
+#~ msgid "%s Activity"
+#~ msgstr "%s Activitat"
+
+# revisar
+#~ msgid "Keep error"
+#~ msgstr "Manté l'error"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "Manté l'error: tots els canvis es perdran"
+
+#~ msgid "Don't stop"
+#~ msgstr "No t'aturis"
+
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
+#~ msgid "OK"
+#~ msgstr "D'acord"
 
-#: ../shell/controlpanel/control.py:463
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "La llengua que té com a codi code=%s no es pot determinar."
+#~ msgid "%d year"
+#~ msgstr "%d any"
 
-#: ../shell/controlpanel/control.py:473
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Ho sento, no parlo '%s'."
+#~ msgid "%d years"
+#~ msgstr "%d anys"
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "Connectat al Portal de la Xarxa de l'Escola"
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d mes"
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "Cercant el Portal de la Xarxa de l'Escola ..."
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d mesos"
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "Connectat a un Portal de Xarxa XO"
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d setmana"
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Cercant un Portal de Xarxa XO ..."
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d setmanes"
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "Connectat a una xarxa simple"
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d dia"
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "Arrancant una xarxa simple"
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d dies"
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "Xarxa desconeguda"
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d hora"
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-#: ../src/view/home/HomeBox.py:175
-#: ../src/view/home/HomeBox.py:216
-msgid "About this XO"
-msgstr "Sobre aquest XO"
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d hores"
 
-#: ../shell/view/home/HomeBox.py:222
-#: ../src/view/home/HomeBox.py:222
-msgid "Not available"
-msgstr "No disponible"
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d minut"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d minuts"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d segon"
+
+#~ msgid " and "
+#~ msgstr "i"
+
+#~ msgid ", "
+#~ msgstr ","
+
+#~ msgid "off"
+#~ msgstr "apagar"
+
+#~ msgid "on"
+#~ msgstr "arrancar"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "Permís denegat: cal que ser root per aquesta operació"
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "Error en llegir la zona horària"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "Error en copiar la zona horària (des de %s): %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "Canviant permisos de zona horària: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Connectat al Portal de la Xarxa de l'Escola"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Cercant el Portal de la Xarxa de l'Escola ..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Connectat a un Portal de Xarxa XO"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Cercant un Portal de Xarxa XO ..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Connectat a una xarxa simple"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Arrancant una xarxa simple"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Xarxa desconeguda"
+
+#~ msgid "About this XO"
+#~ msgstr "Sobre aquest XO"
diff --git a/po/cpp.po b/po/cpp.po
index 93c6b6e..7fd0d5d 100644
--- a/po/cpp.po
+++ b/po/cpp.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,309 +129,736 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -460,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -474,485 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:258
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 63d4e34..7fd0d5d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/dz.po b/po/dz.po
index a79e711..b0faf7d 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index fcb32df..3f6a58a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,13 +7,15 @@ msgstr ""
 "Project-Id-Version: Sugar\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2008-08-05 08:05-0400\n"
-"Last-Translator: Γιάννης Κασκαμανίδης <ttnfy17@yahoo.gr>\n"
+"PO-Revision-Date: 2011-09-30 09:57+0200\n"
+"Last-Translator: pavlos hatzopoulos <phatzopoulos@gmail.com>\n"
 "Language-Team: Greek <olpc@grnet.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -1202,7 +1204,7 @@ msgstr "Απομάκρυνση"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "Το άλλο μέλος ακύρωσε τη μεταφορά αρχείων"
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
@@ -1418,11 +1420,11 @@ msgstr "Το ημερολόγιο είναι κενό"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "Ο φάκελος αρχείων είναι κενός"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "Η συσκευή είναι κενή"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..33c6351
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,1758 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "About Me"
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "You must enter a name."
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "stroke:   colour=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "stroke:   %s"
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "fill:     colour=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "fill:     %s"
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Error in specified colour modifiers."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Error in specified colours."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Click to change your colour:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "About my Computer"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Not available"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Identity"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Serial Number:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Software"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Build:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr "Wireless Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "Copyright and Licence"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+"Sugar is the graphical user interface that you are looking at. Sugar is free "
+"software, covered by the GNU General Public Licence, and you are welcome to "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "Full licence:"
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Date & Time"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Error timezone does not exist."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Timezone"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Frame"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "Value must be an integer."
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "never"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "instantaneous"
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr "%s seconds"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Activation Delay"
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Corner"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Edge"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr "Keyboard"
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr "Keyboard Model"
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr "Key(s) to change layout"
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr "Keyboard Layout(s)"
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Language"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Could not access ~/.i18n. Create standard settings."
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "Language for code=%s could not be determined."
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Sorry I do not speak '%s'."
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr "Modem Configuration"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr "Username:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr "Password:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr "Number:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr "Access Point Name (APN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr "Personal Identity Number (PIN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr "Personal Unblocking Key (PUK):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Network"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "State is unknown."
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Error in specified radio argument use on/off."
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr "Error in specified argument use 0/1."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Wireless"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr "Turn off the wireless radio to save battery life"
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "Radio"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "Discard network history if you have trouble connecting to the network"
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr "Discard network history"
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr "Collaboration"
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Server:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Power"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "Error in automatic pm argument, use on/off."
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "Error in extreme pm argument, use on/off."
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "Power management"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "Automatic power management (increases battery life)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+"Extreme power management (disables wireless radio, increases battery life)"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr "Software update"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr "Checking %s..."
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr "Downloading %s..."
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr "Updating %s..."
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr "Your software is up-to-date"
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] "You can install %s update"
+msgstr[1] "You can install %s updates"
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr "Checking for updates..."
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr "Installing updates..."
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] "%s update was installed"
+msgstr[1] "%s updates were installed"
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr "Install selected"
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr "Download size: %s"
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr "From version %(current)s to %(new)s (Size: %(size)s)"
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr "None"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr "1 KB"
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr "%.0f KB"
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "My Battery"
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr "Removed"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "Charging"
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "Very little power remaining"
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d remaining"
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "Charged"
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr "IP address: %s"
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Disconnect"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Connecting..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Connected"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr "No wireless connection"
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Channel"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr "Wired Network"
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr "Speed"
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr "Wireless modem"
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr "Please wait..."
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Connect"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Disconnected"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr "Try connection again"
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr "Error: %s"
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr "Suggestion: %s"
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr "Connected for %s"
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr "%d KB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr "Check your Pin/Puk configuration."
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr "Check your Access Point Name (APN) configuration"
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr "Check the Number configuration."
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr "Check your configuration."
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Mesh Network"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr "Mesh Network %s"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr "No GSM connection available."
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr "Create a connection in the control panel."
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr "My Speakers"
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr "Unmute"
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr "Mute"
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr "finger"
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr "stylus"
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr "My touchpad"
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "Mesh"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "Group"
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "Home"
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "Activity"
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Screenshot"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr "Screenshot of \"%s\""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+"\"disabled\" to ask nick on initialisation; \"system\" to reuse UNIX account "
+"long name."
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr "Additional directories which can contain updated translations."
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr "Backup URL"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr "Bundle IDs of protected activities"
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"Colour for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke colour and fill colour, format is that of rbg "
+"colours. Example: #AC32FF,#9A5200"
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr "Corner Delay"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr "Default font face"
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr "Default font size"
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr "Default nick"
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr "Delay for the activation of the frame using the corners."
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr "Delay for the activation of the frame using the edges."
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr "Directory to search for translations"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr "Edge Delay"
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr "Favourites Layout"
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr "Favourites resume mode"
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr "Font face that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr "Font size that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr "GSM network APN"
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr "GSM network PIN"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr "GSM network PUK"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr "GSM network access point name configuration"
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr "GSM network number"
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr "GSM network password"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr "GSM network password configuration"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr "GSM network personal identification number configuration"
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr "GSM network personal unlock key configuration"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr "GSM network telephone number configuration"
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr "GSM network username"
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr "GSM network username configuration"
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr "If TRUE, Sugar will show a \"Log out\" option."
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr "If TRUE, Sugar will show a \"Restart\" option."
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr "Jabber Server"
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr "Keyboard layouts"
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr "Keyboard model"
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr "Keyboard options"
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr "Layout of the favourites view."
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr "List of keyboard options."
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr "Power Automatic"
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr "Power Automatic."
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr "Power Extreme"
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr "Power Extreme."
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr "Publish to Gadget"
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr "Setting for muting the sound device."
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr "Show Log out"
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr "Show Restart"
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr "Show Sugar Ad-hoc networks"
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr "Sound Muted"
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr "The keyboard model to be used"
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr "Timezone setting for the system."
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr "URL of the jabber server to use."
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr "URL where the backup is saved to."
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr "User Colour"
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr "User Name"
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr "User name that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+"Users will not be allowed to erase these activities through the list view."
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr "Volume Level"
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr "Volume level for the sound device."
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"When in resume mode, clicking on a favourite icon will cause the last entry "
+"for that activity to be resumed."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: key=%s not an available option"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "To apply your changes you have to restart sugar.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Warning"
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr "Changes require restart"
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr "Cancel changes"
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "Later"
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr "Restart now"
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Done"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Confirm erase"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Confirm erase: Do you want to permanently erase %s?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Keep"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Erase"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Remove favourite"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "Make favourite"
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "Freeform"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "Ring"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr "Spiral"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr "Box"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr "Triangle"
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "Registration Failed"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "Registration Successful"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "You are now registered with your school server."
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Register"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr "Register again"
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr "Software Update"
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr "Update your activities to ensure compatibility with your new software"
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "Check now"
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "List view"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "Favourites view"
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Key Type:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Authentication Type:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr "Wireless Security:"
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Resume"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Join"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr "Ad-hoc Network %d"
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr "Mesh Network %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "Cannot connect to the server."
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "The server could not complete the request."
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr "%s of %s"
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+#, python-format,
+msgid "Transfer from %s"
+msgstr "Transfer from %s"
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr "Accept"
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr "Dismiss"
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant canceled the file transfer"
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+#, python-format,
+msgid "Transfer to %s"
+msgstr "Transfer to %s"
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Remove"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Open"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Open with"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr "%s clipping"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Neighbourhood"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr "F1"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr "F2"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr "F3"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr "F4"
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Name:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Click to change colour:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Back"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Next"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "Untitled"
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "No preview"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr "Kind: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr "Date: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr "Size: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "No date"
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "Participants:"
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "Description:"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "Tags:"
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "Journal"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Search"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr "Today"
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr "Since yesterday"
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr "Past week"
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr "Past month"
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr "Past year"
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr "My friends"
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr "My class"
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr "Anything"
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr "Copy to"
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr "Duplicate"
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr "Error while copying the entry. %s"
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr "Error"
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Start"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr "Sort by date modified"
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr "Sort by date created"
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr "Sort by size"
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr "Sort view"
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr "Your Journal is empty"
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr "Your documents folder is empty"
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr "The device is empty"
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr "No matching entries"
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr "Clear search"
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr "Older Version Of %s Activity"
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr "Do you want to downgrade to version %s"
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr "Your Journal is full"
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr "Please delete some old Journal entries to make space for new ones."
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr "Show Journal"
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "Choose an object"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "Close"
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr "Resume with"
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr "Start with"
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "No activity to start entry"
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr "Send to"
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr "View Details"
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr "Entries without a file cannot be sent."
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr "Entries without a file cannot be copied."
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr "Clipboard"
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr "No friends present"
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr "No valid connection found"
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr "No activity to resume entry"
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr "Documents"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB Free"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr "The reason for the device state change is unknown."
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr "The state change is normal."
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr "The device is now managed."
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr "The device is no longer managed."
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr "The device could not be readied for configuration."
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr "The IP configuration is no longer valid."
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr "Secrets were required, but not provided."
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr "Configuration of the 802.1X supplicant failed."
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr "The 802.1X supplicant quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr "The 802.1X supplicant took too long to authenticate."
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr "The PPP service failed to start within the allowed time."
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr "The PPP service disconnected unexpectedly."
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr "The PPP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr "The DHCP service failed to start within the allowed time."
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr "The DHCP service reported an unexpected error."
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr "The DHCP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr "The shared connection service failed to start."
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr "The shared connection service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr "The AutoIP service failed to start."
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr "The AutoIP service reported an unexpected error."
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr "The AutoIP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr "Dialing failed because the line was busy."
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr "Dialing failed because there was no dial tone."
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr "Dialing failed because there was no carrier."
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr "Dialing timed out."
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr "Dialing failed."
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr "Modem initialisation failed."
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr "Failed to select the specified GSM APN"
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr "Not searching for networks."
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr "Network registration was denied."
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr "Network registration timed out."
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr "Failed to register with the requested GSM network."
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr "PIN check failed."
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr "Necessary firmware for the device may be missing."
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr "The device was removed."
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr "NetworkManager went to sleep."
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr "The device's active connection was removed or disappeared."
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr "A user or client requested the disconnection."
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr "The device's carrier/link changed."
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Remove friend"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Make friend"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Restart"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr "Logout"
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr "My Settings"
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Invite to %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr "<b>%s</b> failed to start."
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Starting..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr "Activity failed to start"
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr "View Source"
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Stop"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr "Start new"
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "Show contents"
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Remove"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr "Instance Source"
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr "Source"
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr "Activity Bundle Source"
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr "Sugar Toolkit Source"
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr "View source: %r"
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr "Sugar in a window"
diff --git a/po/en_US.po b/po/en_US.po
new file mode 100644
index 0000000..3d6232a
--- /dev/null
+++ b/po/en_US.po
@@ -0,0 +1,1758 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "About Me"
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "You must enter a name."
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "stroke:   color=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "stroke:   %s"
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "fill:     color=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "fill:     %s"
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Error in specified color modifiers."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Error in specified colors."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Click to change your color:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "About my Computer"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Not available"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Identity"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Serial Number:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Software"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Build:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr "Wireless Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "Copyright and License"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+"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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "Full license:"
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Date & Time"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Error timezone does not exist."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Timezone"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Frame"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "Value must be an integer."
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "never"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "instantaneous"
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr "%s seconds"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Activation Delay"
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Corner"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Edge"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr "Keyboard"
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr "Keyboard Model"
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr "Key(s) to change layout"
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr "Keyboard Layout(s)"
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Language"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Could not access ~/.i18n. Create standard settings."
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "Language for code=%s could not be determined."
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Sorry I do not speak '%s'."
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr "Modem Configuration"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr "Username:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr "Password:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr "Number:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr "Access Point Name (APN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr "Personal Identity Number (PIN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr "Personal Unblocking Key (PUK):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Network"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "State is unknown."
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Error in specified radio argument use on/off."
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr "Error in specified argument use 0/1."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Wireless"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr "Turn off the wireless radio to save battery life"
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "Radio"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "Discard network history if you have trouble connecting to the network"
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr "Discard network history"
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr "Collaboration"
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Server:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Power"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "Error in automatic pm argument, use on/off."
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "Error in extreme pm argument, use on/off."
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "Power management"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "Automatic power management (increases battery life)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+"Extreme power management (disables wireless radio, increases battery life)"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr "Software update"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr "Checking %s..."
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr "Downloading %s..."
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr "Updating %s..."
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr "Your software is up-to-date"
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] "You can install %s update"
+msgstr[1] "You can install %s updates"
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr "Checking for updates..."
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr "Installing updates..."
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] "%s update was installed"
+msgstr[1] "%s updates were installed"
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr "Install selected"
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr "Download size: %s"
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr "From version %(current)s to %(new)s (Size: %(size)s)"
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr "None"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr "1 KB"
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr "%.0f KB"
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "My Battery"
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr "Removed"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "Charging"
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "Very little power remaining"
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d remaining"
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "Charged"
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr "IP address: %s"
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Disconnect"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Connecting..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Connected"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr "No wireless connection"
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Channel"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr "Wired Network"
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr "Speed"
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr "Wireless modem"
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr "Please wait..."
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Connect"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Disconnected"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr "Try connection again"
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr "Error: %s"
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr "Suggestion: %s"
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr "Connected for %s"
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr "%d KB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr "Check your Pin/Puk configuration."
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr "Check your Access Point Name (APN) configuration"
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr "Check the Number configuration."
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr "Check your configuration."
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Mesh Network"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr "Mesh Network %s"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr "No GSM connection available."
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr "Create a connection in the control panel."
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr "My Speakers"
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr "Unmute"
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr "Mute"
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr "finger"
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr "stylus"
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr "My touchpad"
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "Mesh"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "Group"
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "Home"
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "Activity"
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Screenshot"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr "Screenshot of \"%s\""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr "Additional directories which can contain updated translations."
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr "Backup URL"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr "Bundle IDs of protected activities"
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr "Corner Delay"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr "Default font face"
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr "Default font size"
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr "Default nick"
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr "Delay for the activation of the frame using the corners."
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr "Delay for the activation of the frame using the edges."
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr "Directory to search for translations"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr "Edge Delay"
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr "Favorites Layout"
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr "Favorites resume mode"
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr "Font face that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr "Font size that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr "GSM network APN"
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr "GSM network PIN"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr "GSM network PUK"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr "GSM network access point name configuration"
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr "GSM network number"
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr "GSM network password"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr "GSM network password configuration"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr "GSM network personal identification number configuration"
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr "GSM network personal unlock key configuration"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr "GSM network telephone number configuration"
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr "GSM network username"
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr "GSM network username configuration"
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr "If TRUE, Sugar will show a \"Log out\" option."
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr "If TRUE, Sugar will show a \"Restart\" option."
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr "Jabber Server"
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr "Keyboard layouts"
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr "Keyboard model"
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr "Keyboard options"
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr "Layout of the favorites view."
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr "List of keyboard options."
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr "Power Automatic"
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr "Power Automatic."
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr "Power Extreme"
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr "Power Extreme."
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr "Publish to Gadget"
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr "Setting for muting the sound device."
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr "Show Log out"
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr "Show Restart"
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr "Show Sugar Ad-hoc networks"
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr "Sound Muted"
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr "The keyboard model to be used"
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr "Timezone setting for the system."
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr "URL of the jabber server to use."
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr "URL where the backup is saved to."
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr "User Color"
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr "User Name"
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr "User name that is used throughout the desktop."
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+"Users will not be allowed to erase these activities through the list view."
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr "Volume Level"
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr "Volume level for the sound device."
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: key=%s not an available option"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "To apply your changes you have to restart sugar.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Warning"
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr "Changes require restart"
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr "Cancel changes"
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "Later"
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr "Restart now"
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Done"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Confirm erase"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Confirm erase: Do you want to permanently erase %s?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Keep"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Erase"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Remove favorite"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "Make favorite"
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "Freeform"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "Ring"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr "Spiral"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr "Box"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr "Triangle"
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "Registration Failed"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "Registration Successful"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "You are now registered with your school server."
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Register"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr "Register again"
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr "Software Update"
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr "Update your activities to ensure compatibility with your new software"
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "Check now"
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "List view"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "Favorites view"
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Key Type:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Authentication Type:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr "Wireless Security:"
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Resume"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Join"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr "Ad-hoc Network %d"
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr "Mesh Network %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "Cannot connect to the server."
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "The server could not complete the request."
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr "%s of %s"
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+#, python-format,
+msgid "Transfer from %s"
+msgstr "Transfer from %s"
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr "Accept"
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr "Dismiss"
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant canceled the file transfer"
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+#, python-format,
+msgid "Transfer to %s"
+msgstr "Transfer to %s"
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Remove"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Open"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Open with"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr "%s clipping"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Neighborhood"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr "F1"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr "F2"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr "F3"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr "F4"
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Name:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Click to change color:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Back"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Next"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "Untitled"
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "No preview"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr "Kind: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr "Date: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr "Size: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "No date"
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "Participants:"
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "Description:"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "Tags:"
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "Journal"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Search"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr "Today"
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr "Since yesterday"
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr "Past week"
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr "Past month"
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr "Past year"
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr "My friends"
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr "My class"
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr "Anything"
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr "Copy to"
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr "Duplicate"
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr "Error while copying the entry. %s"
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr "Error"
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Start"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr "Sort by date modified"
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr "Sort by date created"
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr "Sort by size"
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr "Sort view"
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr "Your Journal is empty"
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr "Your documents folder is empty"
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr "The device is empty"
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr "No matching entries"
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr "Clear search"
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr "Older Version Of %s Activity"
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr "Do you want to downgrade to version %s"
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr "Your Journal is full"
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr "Please delete some old Journal entries to make space for new ones."
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr "Show Journal"
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "Choose an object"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "Close"
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr "Resume with"
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr "Start with"
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "No activity to start entry"
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr "Send to"
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr "View Details"
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr "Entries without a file cannot be sent."
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr "Entries without a file cannot be copied."
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr "Clipboard"
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr "No friends present"
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr "No valid connection found"
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr "No activity to resume entry"
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr "Documents"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB Free"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr "The reason for the device state change is unknown."
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr "The state change is normal."
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr "The device is now managed."
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr "The device is no longer managed."
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr "The device could not be readied for configuration."
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr "The IP configuration is no longer valid."
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr "Secrets were required, but not provided."
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr "Configuration of the 802.1X supplicant failed."
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr "The 802.1X supplicant quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr "The 802.1X supplicant took too long to authenticate."
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr "The PPP service failed to start within the allowed time."
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr "The PPP service disconnected unexpectedly."
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr "The PPP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr "The DHCP service failed to start within the allowed time."
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr "The DHCP service reported an unexpected error."
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr "The DHCP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr "The shared connection service failed to start."
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr "The shared connection service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr "The AutoIP service failed to start."
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr "The AutoIP service reported an unexpected error."
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr "The AutoIP service quit or failed unexpectedly."
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr "Dialing failed because the line was busy."
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr "Dialing failed because there was no dial tone."
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr "Dialing failed because there was no carrier."
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr "Dialing timed out."
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr "Dialing failed."
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr "Modem initialization failed."
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr "Failed to select the specified GSM APN"
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr "Not searching for networks."
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr "Network registration was denied."
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr "Network registration timed out."
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr "Failed to register with the requested GSM network."
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr "PIN check failed."
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr "Necessary firmware for the device may be missing."
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr "The device was removed."
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr "NetworkManager went to sleep."
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr "The device's active connection was removed or disappeared."
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr "A user or client requested the disconnection."
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr "The device's carrier/link changed."
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Remove friend"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Make friend"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Restart"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr "Logout"
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr "My Settings"
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Invite to %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr "<b>%s</b> failed to start."
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Starting..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr "Activity failed to start"
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr "View Source"
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Stop"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr "Start new"
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "Show contents"
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Remove"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr "Instance Source"
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr "Source"
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr "Activity Bundle Source"
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr "Sugar Toolkit Source"
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr "View source: %r"
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr "Sugar in a window"
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 0000000..8151467
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,1713 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 08db87b..1b41bc8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-01-09 10:16+0000\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,405 +15,1876 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "نام:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "اشتباه در تعدیل کننده رنگ معین"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "اشتباه د رنگ معین"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "برای تبدیلی رنگ تیک کن:"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "عقب"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "شد"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "بعدی"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "دوست را پاک کن"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "دوست بسازید"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "اشتباه منطقه جغرافیایی ساعات وجود ندارد"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d ثانیه ها"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "دسترسی نمیتواند %s. زمینه معیاری بسازید"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Invite to %s"
-msgstr "دعوت به ( ) %s"
+msgid "Language for code=%s could not be determined."
+msgstr "زبان برای رمز=%s تعین نمی گردد"
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
-msgstr "پاک کردن"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "ببخشید من سخن گفته نمیتوانم \"%s\""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "باز کردن"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "به یادداشت اضافه کردن"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "حالان نامشخص هست"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "اشتباه دراستدلال معین از خاموش/روشن نمودن رادیو "
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "اشتباه دراستدلال معین از خاموش/روشن نمودن رادیو "
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "شی در حافظه : %s"
+msgid "Checking %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "نوعیت کلید:"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "نوعیت تصدیق:"
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "نوعیت پنهانی کردن:"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "در حال شروع شدن...."
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "از سر گرفتن"
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "توقف"
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
-msgstr "عکس صفحه"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "دوباره چالان کردن"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "بند کردن"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "راجستر و ثبت کردن"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "شد"
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "منقطع شدن"
-
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "شبکه بافته شده"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "پیوستن"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "دوام باطری من"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "باطری پر میشود"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "باطری خالی میشود"
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "پاک کردن"
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "باطری کاملا پر ش"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
 msgstr "منقطع شد"
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "کانال"
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "همسایگی"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "منقطع شد"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "لغو کن"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "شبکه بافته شده"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "شبکه بافته شده"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "گروه"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "خانه"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr " فعالیت"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "تقسیم با:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "عکس صفحه"
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "شخصی"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "همسایگی من"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "نگه داشتن"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "نکن"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "تکرار کن"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "نقل بگیر"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "بچسپان"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
-msgstr "%s فعالیت"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "نگه داشتن اشتباه"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "نگه داشتن اشتباه: همه تغیرات از بین میروند"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "توقف نکن"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "به هر طوری توقف کن"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "برای اجرا نمودن تغیرات تان شما باید شوگر را دوباره چالان کنید\n"
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "لغو کن"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "شد"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "درست است."
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "جاری"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "درست است."
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d سال"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "نگه داشتن"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
-msgstr "%d سال ها"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "راجستر و ثبت کردن"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "نوعیت کلید:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "نوعیت تصدیق:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "از سر گرفتن"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "پیوستن"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
-msgstr "%d ماه"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "شبکه بافته شده"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
-msgstr "%d ماه ها"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
-msgstr "%d هفته"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
-msgstr "%d هفته ها"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
-msgstr "%d روز"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
-msgstr "%d روزها"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
-msgstr "%d ساعت"
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
-msgstr "%d ساعت ها"
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "پاک کردن"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "باز کردن"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
-msgstr "%d دقیقه"
+msgid "%s clipping"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "همسایگی"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "نام:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "برای تبدیلی رنگ تیک کن:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "عقب"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "بعدی"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
-msgstr "%d دقایق"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
-msgstr "%d ثانیه"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
-msgstr "%d ثانیه ها"
+msgid "Size: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr "_ و _"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr "_ یا _"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "برای اجرا نمودن تغیرات تان شما باید شوگر را دوباره چالان کنید\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "اشتباه در تعدیل کننده رنگ معین"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "اشتباه د رنگ معین"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "خاموش کردن"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "روشن کردن"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "حالان نامشخص هست"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
-msgstr "اشتباه دراستدلال معین از خاموش/روشن نمودن رادیو "
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
-msgstr "تردید اجازه. شما برای راندن این روش باید ریشه کار باشید"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "اشتباه در خواندن منطقه جغرافیایی ساعات"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "اشتباه در نقل برداری منطقه جغرافیایی ساعات (از %s): %s"
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "تبدیلی اجازت منطقه جغرافیایی ساعات: %s"
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "اشتباه منطقه جغرافیایی ساعات وجود ندارد"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "دسترسی نمیتواند %s. زمینه معیاری بسازید"
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "دوست را پاک کن"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "دوست بسازید"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "بند کردن"
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "زبان برای رمز=%s تعین نمی گردد"
+msgid "Invite to %s"
+msgstr "دعوت به ( ) %s"
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "ببخشید من سخن گفته نمیتوانم \"%s\""
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "در حال شروع شدن...."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "با مدخل تنیده مکتب وصل گردید"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "توقف"
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "در حال تلاش برای یک مدخل تنیده مکتب"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "با مدخل تنیده XO وصل گردید"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "پاک کردن"
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "در حال تلاش برای یک مدخل تنیده XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "با یک بافته ساده وصل گردید"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "در حال شروع یک بافته ساده"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "بافته نا مشخص"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "به یادداشت اضافه کردن"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "شی در حافظه : %s"
+
+#~ msgid "Encryption Type:"
+#~ msgstr "نوعیت پنهانی کردن:"
+
+#~ msgid "Reboot"
+#~ msgstr "دوباره چالان کردن"
+
+#~ msgid "Disconnect..."
+#~ msgstr "منقطع شدن"
+
+#~ msgid "My Battery life"
+#~ msgstr "دوام باطری من"
+
+#~ msgid "Battery charging"
+#~ msgstr "باطری پر میشود"
+
+#~ msgid "Battery discharging"
+#~ msgstr "باطری خالی میشود"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "باطری کاملا پر ش"
+
+#~ msgid "Share with:"
+#~ msgstr "تقسیم با:"
+
+#~ msgid "Private"
+#~ msgstr "شخصی"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "همسایگی من"
+
+#~ msgid "Undo"
+#~ msgstr "نکن"
+
+#~ msgid "Redo"
+#~ msgstr "تکرار کن"
+
+#~ msgid "Copy"
+#~ msgstr "نقل بگیر"
+
+#~ msgid "Paste"
+#~ msgstr "بچسپان"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s فعالیت"
+
+#~ msgid "Keep error"
+#~ msgstr "نگه داشتن اشتباه"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "نگه داشتن اشتباه: همه تغیرات از بین میروند"
+
+#~ msgid "Don't stop"
+#~ msgstr "توقف نکن"
+
+#~ msgid "Stop anyway"
+#~ msgstr "به هر طوری توقف کن"
+
+#~ msgid "Continue"
+#~ msgstr "جاری"
+
+#~ msgid "OK"
+#~ msgstr "درست است."
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d سال"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d سال ها"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d ماه"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d ماه ها"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d هفته"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d هفته ها"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d روز"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d روزها"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d ساعت"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d ساعت ها"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d دقیقه"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d دقایق"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d ثانیه"
+
+#~ msgid " and "
+#~ msgstr "_ و _"
+
+#~ msgid ", "
+#~ msgstr "_ یا _"
+
+#~ msgid "off"
+#~ msgstr "خاموش کردن"
+
+#~ msgid "on"
+#~ msgstr "روشن کردن"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "تردید اجازه. شما برای راندن این روش باید ریشه کار باشید"
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "اشتباه در خواندن منطقه جغرافیایی ساعات"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "اشتباه در نقل برداری منطقه جغرافیایی ساعات (از %s): %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "تبدیلی اجازت منطقه جغرافیایی ساعات: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "با مدخل تنیده مکتب وصل گردید"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "در حال تلاش برای یک مدخل تنیده مکتب"
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "با مدخل تنیده XO وصل گردید"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "در حال تلاش برای یک مدخل تنیده XO"
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "با یک بافته ساده وصل گردید"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "در حال شروع یک بافته ساده"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "بافته نا مشخص"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index f285c64..7a81c1a 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-02-06 06:09-0500\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,405 +15,1879 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "نام:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "خطا در تعدیل کننده رنگ معین."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "خطا در رنگ معین."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "برای تبدیلی رنگ تیک کن:"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "عقب"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "شد"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "در دسترس نیست"
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "بعدی"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "دوست را حذف کن"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "دوست بسازید"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "خطای منطقه زمانی وجود ندارد."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d ثانیه ها"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "به %s دسترسی نمی تواند. زمینه معیاریی بسازید."
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Invite to %s"
-msgstr "دعوت به %s"
+msgid "Language for code=%s could not be determined."
+msgstr "زبان برای رمز=%s تعیین کرده نمیشود."
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
-msgstr "حذف کن"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "متأسفم من '%s' گفته نمیتوانم."
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "باز کن"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "وضعیت نامشخص است."
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "روشن یا خاموش بودن خطا در استدلال مشخص استعمال رادیویی."
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "روشن یا خاموش بودن خطا در استدلال مشخص استعمال رادیویی."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "به یادداشت اضافه کن"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "شیی تخته رسم : %s."
+msgid "Checking %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "نوعیت کلید:"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "نوعیت تصدیق:"
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "نوعیت پنهانی کردن:"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "در حال شروع شدن..."
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "ادامه"
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "توقف"
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
-msgstr "عکس صفحه"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "راه اندازي مجدد"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "خاموش کردن"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "ثبت کردن"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "منقطع شدن..."
-
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "شبکه تنیده"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "شد"
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "پیوستن"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "حیات باطری من"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "باطری در حال پرشدن"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "باطری در حال تخلیه"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "باطری کاملا پر شد"
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "حذف کن"
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
 msgstr "منقطع شد"
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "کانال"
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "همسایگی"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "منقطع شد"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "لغو کن"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "شبکه تنیده"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "شبکه تنیده"
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "گروه"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "خانه"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "فعالیت"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "تقسیم با:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "عکس صفحه"
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "شخصی"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "همسایگی من"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "نگه داشتن"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "نکن"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "تکرار کن"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "نقل بگیر"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "بچسپان"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
-msgstr "فعالیت %s"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "خطا را نگه دار"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "خطا را نگه دار: همه تغیرات از بین خواهند رفت"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "توقف نکن"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "به هر صورت توقف کن"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "برای اجرا نمودن تغیرات تان شما باید شکر را دوباره آغاز کنید.\n"
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "لغو کن"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "شد"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "درست است"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "جاری"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d سال"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "نگه داشتن"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
-msgstr "%d سال"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "ثبت کردن"
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "نوعیت کلید:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "نوعیت تصدیق:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "ادامه"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "پیوستن"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "شبکه تنیده"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d month"
-msgstr "%d ماه"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d months"
-msgstr "%d ماه"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d week"
-msgstr "%d هفته"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d weeks"
-msgstr "%d هفته ها"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d day"
-msgstr "%d روز"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d days"
-msgstr "%d روزها"
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hour"
-msgstr "%d ساعت"
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "حذف کن"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "باز کن"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d hours"
-msgstr "%d ساعت ها"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "همسایگی"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "نام:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "برای تبدیلی رنگ تیک کن:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "عقب"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "بعدی"
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minute"
-msgstr "%d دقیقه"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d minutes"
-msgstr "%d دقیقه ها"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d second"
-msgstr "%d ثانیه"
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%d seconds"
-msgstr "%d ثانیه ها"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr " و "
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr "، "
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "برای اجرا نمودن تغیرات تان شما باید شکر را دوباره آغاز کنید.\n"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "خطا در تعدیل کننده رنگ معین."
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "خطا در رنگ معین."
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "خاموش"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "روشن"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "وضعیت نامشخص است."
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
-msgstr "روشن یا خاموش بودن خطا در استدلال مشخص استعمال رادیویی."
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
-msgstr "اجازه غير قابل دسترس هست. شما برای اجرای این طریقه باید ریشه باشید."
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "خطا در خوانش منطقه زمانی"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "خطا در خوانش منطقه زمانی (از %s): %s"
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "در حال تغییر دادن اجازت منطقه زمانی: %s"
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "خطای منطقه زمانی وجود ندارد."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "به %s دسترسی نمی تواند. زمینه معیاریی بسازید."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "دوست را حذف کن"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "دوست بسازید"
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "خاموش کردن"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "زبان برای رمز=%s تعیین کرده نمیشود."
+msgid "Invite to %s"
+msgstr "دعوت به %s"
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "متأسفم من '%s' گفته نمیتوانم."
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "در حال شروع شدن..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "توقف"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "با مدخل تنیده مکتب وصل گردید"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "در حال تلاش برای یک مدخل تنیده مکتب..."
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "حذف کن"
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "با مدخل تنیده XO وصل گردید"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "در حال تلاش برای یک مدخل تنیده XO..."
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "با یک شبکه تنیده ساده وصل گردید"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "در حال شروع کردن یک شبکه تنیده ساده"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "شبکه تنیده نامشخص"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
-msgstr "در مورد این XO"
+#~ msgid "Add to journal"
+#~ msgstr "به یادداشت اضافه کن"
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
-msgstr "در دسترس نیست"
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "شیی تخته رسم : %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "نوعیت پنهانی کردن:"
+
+#~ msgid "Reboot"
+#~ msgstr "راه اندازي مجدد"
+
+#~ msgid "Disconnect..."
+#~ msgstr "منقطع شدن..."
+
+#~ msgid "My Battery life"
+#~ msgstr "حیات باطری من"
+
+#~ msgid "Battery charging"
+#~ msgstr "باطری در حال پرشدن"
+
+#~ msgid "Battery discharging"
+#~ msgstr "باطری در حال تخلیه"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "باطری کاملا پر شد"
+
+#~ msgid "Share with:"
+#~ msgstr "تقسیم با:"
+
+#~ msgid "Private"
+#~ msgstr "شخصی"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "همسایگی من"
+
+#~ msgid "Undo"
+#~ msgstr "نکن"
+
+#~ msgid "Redo"
+#~ msgstr "تکرار کن"
+
+#~ msgid "Copy"
+#~ msgstr "نقل بگیر"
+
+#~ msgid "Paste"
+#~ msgstr "بچسپان"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "فعالیت %s"
+
+#~ msgid "Keep error"
+#~ msgstr "خطا را نگه دار"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "خطا را نگه دار: همه تغیرات از بین خواهند رفت"
+
+#~ msgid "Don't stop"
+#~ msgstr "توقف نکن"
+
+#~ msgid "Stop anyway"
+#~ msgstr "به هر صورت توقف کن"
+
+#~ msgid "Continue"
+#~ msgstr "جاری"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d سال"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d سال"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d ماه"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d ماه"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d هفته"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d هفته ها"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d روز"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d روزها"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d ساعت"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d ساعت ها"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d دقیقه"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d دقیقه ها"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d ثانیه"
+
+#~ msgid " and "
+#~ msgstr " و "
+
+#~ msgid ", "
+#~ msgstr "، "
+
+#~ msgid "off"
+#~ msgstr "خاموش"
+
+#~ msgid "on"
+#~ msgstr "روشن"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "اجازه غير قابل دسترس هست. شما برای اجرای این طریقه باید ریشه باشید."
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "خطا در خوانش منطقه زمانی"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "خطا در خوانش منطقه زمانی (از %s): %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "در حال تغییر دادن اجازت منطقه زمانی: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "با مدخل تنیده مکتب وصل گردید"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "در حال تلاش برای یک مدخل تنیده مکتب..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "با مدخل تنیده XO وصل گردید"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "در حال تلاش برای یک مدخل تنیده XO..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "با یک شبکه تنیده ساده وصل گردید"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "در حال شروع کردن یک شبکه تنیده ساده"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "شبکه تنیده نامشخص"
+
+#~ msgid "About this XO"
+#~ msgstr "در مورد این XO"
diff --git a/po/ff.po b/po/ff.po
index a79e711..b0faf7d 100644
--- a/po/ff.po
+++ b/po/ff.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/fil.po b/po/fil.po
index 93c6b6e..7fd0d5d 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,309 +129,736 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -460,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -474,485 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:258
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4f91359..20fd92f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-10-08 18:22+0200\n"
-"Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
+"PO-Revision-Date: 2011-10-10 06:21+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -558,7 +558,7 @@ msgstr "Vérifiez votre configuration Pin/Puk."
 
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr "Vérifiez la configuration de votre nom de point d'accès (APN)."
+msgstr "Vérifiez la configuration de votre nom de point d'accès (APN)"
 
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
@@ -1214,7 +1214,7 @@ msgstr "Refuser"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr "L'autre participant a annulé le transfert de fichiers."
+msgstr "L'autre participant a annulé le transfert de fichiers"
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
@@ -1662,7 +1662,7 @@ msgstr "Échec de l'initialisation du modem."
 
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
-msgstr "Échec de la sélection de l'APN du GSM spécifié."
+msgstr "Échec de la sélection de l'APN du GSM spécifié"
 
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
diff --git a/po/gu.po b/po/gu.po
index baf1787..b0faf7d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-09 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,331 +16,874 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../src/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:104 ../src/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/activitiesdonut.py:111
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:175 ../src/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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:90 ../src/view/home/MeshBox.py:197
-#: ../src/view/devices/network/wireless.py:113
-#: ../src/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:195 ../src/view/devices/network/mesh.py:37
-#: ../src/view/devices/network/mesh.py:62
-#: ../src/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:131
-msgid "Channel"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:54
-msgid "Group"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:66
-msgid "Home"
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:78
-msgid "Activity"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "%s Activity"
+msgid "Checking %s..."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
-msgid "Ok"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
-#: ../src/controlpanel/control.py:219
-msgid "To apply your changes you have to restart sugar.\n"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
 msgstr ""
 
-#: ../src/controlpanel/control.py:273
-msgid "Error in specified color modifiers."
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/controlpanel/control.py:276
-msgid "Error in specified colors."
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
 msgstr ""
 
-#: ../src/controlpanel/control.py:312
-msgid "off"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
 msgstr ""
 
-#: ../src/controlpanel/control.py:314
-msgid "on"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
 msgstr ""
 
-#: ../src/controlpanel/control.py:316
-msgid "State is unknown."
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
 msgstr ""
 
-#: ../src/controlpanel/control.py:336
-msgid "Error in specified radio argument use on/off."
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
 msgstr ""
 
-#: ../src/controlpanel/control.py:340
-msgid "Permission denied. You need to be root to run this method."
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/controlpanel/control.py:370
-msgid "Error in reading timezone"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../src/controlpanel/control.py:401
+#: ../extensions/deviceicon/network.py:49
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
 msgstr ""
 
-#: ../src/controlpanel/control.py:406
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Error: %s"
 msgstr ""
 
-#: ../src/controlpanel/control.py:416
-msgid "Error timezone does not exist."
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
 msgstr ""
 
-#: ../src/controlpanel/control.py:421 ../src/controlpanel/control.py:440
+#: ../extensions/deviceicon/network.py:349
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "Connected for %s"
 msgstr ""
 
-#: ../src/controlpanel/control.py:467
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
 msgstr ""
 
-#: ../src/controlpanel/control.py:477
+#: ../extensions/deviceicon/network.py:656
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:27
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -350,16 +893,821 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:55 ../src/controlpanel/cmd.py:67
-#: ../src/controlpanel/cmd.py:74
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:80
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "sugar-control-panel: %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/ha.po b/po/ha.po
index 53ad5cf..9348bb9 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2006-07-10 16:37+0100\n"
 "Last-Translator: saudat mohammed <saudat@wazobialinux>\n"
 "Language-Team: hausa\n"
@@ -15,433 +15,1716 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../shell/PresenceWindow.py:62
-msgid "Who's around:"
-msgstr "Wa ke nan:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/PresenceWindow.py:104
-msgid "Share"
-msgstr "Raba"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
 
-#: ../shell/StartPage.py:189
-msgid "Search"
-msgstr "Yi Bincike"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Baya"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:23
-msgid "Forward"
-msgstr "Tura"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:29
-msgid "Reload"
-msgstr "Sake Lodi"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../shell/shell.py:333
-msgid "Everyone"
-msgstr "Kowa"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
 
-#: ../sugar/chat/ChatEditor.py:43
-msgid "Send"
-msgstr "Aika"
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d year"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d month"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Baya"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Yi Bincike"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Who's around:"
+#~ msgstr "Wa ke nan:"
+
+#~ msgid "Share"
+#~ msgstr "Raba"
+
+#~ msgid "Forward"
+#~ msgstr "Tura"
+
+#~ msgid "Reload"
+#~ msgstr "Sake Lodi"
+
+#~ msgid "Everyone"
+#~ msgstr "Kowa"
+
+#~ msgid "Send"
+#~ msgstr "Aika"
diff --git a/po/he.po b/po/he.po
index 63d4e34..7fd0d5d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 522ddc9..51715f7 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,56 +6,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 00:32-0500\n"
-"PO-Revision-Date: 2008-04-11 03:32-0400\n"
-"Last-Translator: Prashant Thakkar <prashantbthakkar@gmail.com>\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: 2011-10-05 09:14+0200\n"
+"Last-Translator: satyaakam goswami <satyaakam@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
 msgstr "मेरे बारे में"
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr "आपको एक नाम प्रविष्ट करना होगा."
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "स्ट्रोक:   रंग=%s वर्ण=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr "स्ट्रोक:   %s"
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "भरें:     रंग=%s वर्ण=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr "भरें:     %s"
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
-msgstr " दिए गये रंगरूपांतर के वर्णन मे ग़लती है"
+msgstr "दिए गये रंगरूपांतर के वर्णन मे ग़लती है"
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
-msgstr "  दिए गये रंगो के वर्णन मे ग़लती है"
+msgstr "दिए गये रंगो के वर्णन मे ग़लती है"
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:93
-msgid "Name:"
-msgstr "नाम"
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr "रंग बदलने हेतु क्लिक करें:"
 
@@ -63,43 +61,48 @@ msgstr "रंग बदलने हेतु क्लिक करें:"
 msgid "About my Computer"
 msgstr "मेरे कम्प्यूटर के बारे में"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr "उपलब्ध नही है"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr "पहचान"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr "सरल क्रमांक:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr "सॉफ्टवेयर"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr "बिल्ड:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr "सुगर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr "फर्मवेयर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr "वायरलेस फर्मवेयर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr "सर्वाधिकार तथा लाइसेंस"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -111,7 +114,7 @@ msgstr ""
 "लाइसेंस में दिए गए कुछ विशेष शर्तों के अधीन आप इसमें परिवर्तन करने या इसकी "
 "प्रति बनाकर वितरण करने के लिए आपका स्वागत है."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr "पूरा लाइसेंस:"
 
@@ -119,11 +122,11 @@ msgstr "पूरा लाइसेंस:"
 msgid "Date & Time"
 msgstr "तारीख़ व समय"
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr "गलती:  समयक्षेत्र मौजूद नही है"
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:33
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr "समयक्षेत्र"
 
@@ -131,50 +134,50 @@ msgstr "समयक्षेत्र"
 msgid "Frame"
 msgstr "ढांचा"
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr "मूल्य पूर्णांक में होना चाहिए."
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr "कभी नहीं"
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr "तत्काल"
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr "%s सेकंड"
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr "सक्रियण देरी"
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr "किनारा"
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr "किनारा"
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr "कुंजीपट"
 
-#: ../extensions/cpsection/keyboard/view.py:189
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr "कुंजीपट मॉडल"
 
-#: ../extensions/cpsection/keyboard/view.py:248
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr "खाका बदलने के लिए कुंजियाँ"
 
-#: ../extensions/cpsection/keyboard/view.py:318
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr "कुंजीपट खाका"
 
@@ -183,21 +186,21 @@ msgstr "कुंजीपट खाका"
 msgid "Language"
 msgstr "भाषा"
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr " ~/.i18n पर पहुँच नहीं सका. मानक सेटिंग बनाएँ"
+msgstr "~/.i18n पर पहुँच नहीं सका. मानक सेटिंग बनाएँ"
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "कूट की भाषा = %s अग्यात है"
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "माफ़ कीजिए , मैं %s नही बोलता"
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
@@ -207,68 +210,84 @@ msgstr ""
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
-msgstr ""
+msgstr "मोडेम विन्यास"
 
-#: ../extensions/cpsection/modemconfiguration/view.py:90
+#: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr ""
+msgstr "उपयोक्ता नाम"
 
-#: ../extensions/cpsection/modemconfiguration/view.py:101
+#: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr ""
+msgstr "कूटशब्द"
 
-#: ../extensions/cpsection/modemconfiguration/view.py:112
+#: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr ""
+msgstr "नम्बर"
 
-#: ../extensions/cpsection/modemconfiguration/view.py:123
-msgid "APN:"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr "एक्सेस प्वाइंट नाम"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr "व्यक्तिगत पहचान संख्या (PIN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr "व्यक्तिगत निरुद्ध  कुंजी (PUK):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
+"आप निम्नलिखित जानकारी प्रदान करने के लिए एक सेलुलर  संजाल(3 जी) के लिए एक "
+"मोबाइल ब्रॉडबैंड कनेक्शन के सेट की आवश्यकता होगी."
 
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
-msgstr "नेटवर्क"
+msgstr "संजाल"
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr "स्थिति अज्ञात है"
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr "दिए गये रेडियो तर्क मे ग़लती है ,बंद/चालू का वापर करे"
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr "निर्दिष्ट तर्क प्रयोग 0/1 में त्रुटि है."
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "वायरलेस"
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr "बैटरी का जीवन बढ़ाने के लिए वायरलेस रेडियो को बन्द कर दें"
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr "रेडियो"
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 "यदि आपको नेटवर्क में कनेक्ट करने में समस्या हो रही है तो नेटवर्क इतिहास को "
 "मिटा दें."
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr "नेटवर्क इतिहास मिटाएँ"
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "साझेदारी"
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
@@ -277,7 +296,7 @@ msgstr ""
 "सर्वर को आपके कमरे के रुप में, जहाँ आप हैं, माना जा सकता है. एक ही सर्वर के "
 "लोग आपस में एक दूसरे को देख सकेंगे, भले ही वो एक ही नेटवर्क में न हों."
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "सर्वर:"
 
@@ -285,25 +304,25 @@ msgstr "सर्वर:"
 msgid "Power"
 msgstr "पावर"
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr "स्वचालित पीएम तर्क में त्रुटि है, चालू/बन्द प्रयोग करें."
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr "एक्सट्रीम पीएम तर्क में त्रुटि है, चालू/बन्द प्रयोग करें."
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr "बिज़ली प्रबंधन"
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr "स्वचालित बिजली प्रबंधन (बैटरी का जीवन बढ़ाता है)"
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 "एक्सट्रीम ऊर्जा प्रबंधन (वायरलेस रेडियो को बन्द करता है, बैटरी का जीवन "
 "बढ़ाने के लिए)"
@@ -354,26 +373,27 @@ msgstr "अद्यतन के लिए जाँचा जा रहा ह
 msgid "Installing updates..."
 msgstr "अद्यतनों को संस्थापित किया जा रहा है..."
 
-#: ../extensions/cpsection/updater/view.py:172
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] "%s अद्यतन संस्थापित किया गया"
 msgstr[1] "%s अद्यतनों को संस्थापित किया गया"
 
-#: ../extensions/cpsection/updater/view.py:253
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr "चयनित को संस्थापित करें"
 
-#: ../extensions/cpsection/updater/view.py:274
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr "डाउनलोड आकार: %s"
 
-#: ../extensions/cpsection/updater/view.py:362
-#, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
-msgstr "संस्करण %(current)d से %(new)s (आकार: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format, 
+#, python-format,
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr "संस्करण %(current) से %(new) (आकार: %(size))"
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
@@ -397,28 +417,28 @@ msgstr "%.0f कि.बा."
 msgid "%.1f MB"
 msgstr "%.1f मे.बा."
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "मेरी बैटरी"
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr "हटा दिया गया"
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "चार्जिंग में"
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "बहुत कम पावर बचा है"
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d बाकी"
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "चार्ज है"
 
@@ -427,126 +447,176 @@ msgstr "चार्ज है"
 msgid "IP address: %s"
 msgstr "आईपी पता: %s"
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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
-#: ../extensions/deviceicon/network.py:111
-msgid "Disconnect..."
-msgstr " सम्पर्क तोडे"
-
-#: ../extensions/deviceicon/network.py:116
-msgid "Create new wireless network"
-msgstr "नया वायरलेस नेटवर्क बनाएँ"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "डिस्कनेक्ट"
 
 # Only show disconnect when there's a mesh device, because mesh takes
 # 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
-#: ../extensions/deviceicon/network.py:122
-#: ../extensions/deviceicon/network.py:284
-#: ../src/jarabe/desktop/meshbox.py:248 ../src/jarabe/desktop/meshbox.py:537
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr "कनेक्ट हो रहा है..."
 
-#: ../extensions/deviceicon/network.py:126
-#: ../extensions/deviceicon/network.py:198
-#: ../extensions/deviceicon/network.py:288
-#: ../src/jarabe/desktop/meshbox.py:254 ../src/jarabe/desktop/meshbox.py:543
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr "कनेक्टेड"
 
-#: ../extensions/deviceicon/network.py:158
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr "वायरलेस कनेक्शन नहीं"
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "माध्यम"
 
-#: ../extensions/deviceicon/network.py:173
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr "वायर्ड नेटवर्क"
 
-#: ../extensions/deviceicon/network.py:201
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr "गति"
 
-#: ../extensions/deviceicon/network.py:228
+#: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
-msgstr ""
+msgstr "वायरलेस मॉडेम"
 
-#: ../extensions/deviceicon/network.py:276
+#: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr ""
+msgstr "कृपया प्रतीक्षा करें ..."
 
-#: ../extensions/deviceicon/network.py:279
-#: ../src/jarabe/desktop/meshbox.py:164 ../src/jarabe/desktop/meshbox.py:494
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
 msgid "Connect"
 msgstr "कनेक्ट"
 
-#: ../extensions/deviceicon/network.py:280
+#: ../extensions/deviceicon/network.py:287
 msgid "Disconnected"
 msgstr "सम्पर्क टूट गया"
 
-#: ../extensions/deviceicon/network.py:283
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:700
-#: ../src/jarabe/frame/activitiestray.py:799
-#: ../src/jarabe/frame/activitiestray.py:827
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
 msgid "Cancel"
 msgstr "रद्द करें"
 
-#: ../extensions/deviceicon/network.py:287
-#: ../src/jarabe/desktop/meshbox.py:168
-msgid "Disconnect"
-msgstr "डिस्कनेक्ट"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr "कनेक्शन फिर से: प्रयास करें"
 
-#: ../extensions/deviceicon/network.py:530
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-#, fuzzy
-msgid "%s's network"
-msgstr "%s का नेटवर्क %s"
+msgid "Error: %s"
+msgstr "त्रुटि: %s"
 
-#: ../extensions/deviceicon/network.py:597
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr "सुझाव: %s"
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr "%s के लिए जुड़ा"
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+#, python-format,
+msgid "%d KB"
+msgstr "%d कि.बा."
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr "अपने पिन / PUK विन्यास की जाँच करें."
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr "अपने एक्सेस प्वाइंट (APN) नाम विन्यास की जाँच करें"
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr "संख्या विन्यास की जाँच करें."
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr "आपके विन्यास की जाँच करें."
+
+#: ../extensions/deviceicon/network.py:612
 msgid "Mesh Network"
-msgstr "मेश नेटवर्क  "
+msgstr "मेश नेटवर्क"
 
-#: ../extensions/deviceicon/network.py:857
+#: ../extensions/deviceicon/network.py:656
 #, python-format
-msgid "Data sent %d kb / received %d kb"
-msgstr ""
+msgid "Mesh Network %s"
+msgstr "मेश नेटवर्क  %s"
 
-#: ../extensions/deviceicon/network.py:868
-msgid "Connection time "
-msgstr ""
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr "कोई जीएसएम कनेक्शन उपलब्ध है."
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr "नियंत्रण कक्ष में एक कनेक्शन बनाएँ."
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "मेरे स्पीकर"
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "मौन हटाएँ"
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "मौन"
 
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr "उंगली"
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr "लेखनी"
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr "मेरा touchpad"
+
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr "जाल"
 
 #: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "समूह"
 
 #: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "घर"
 
 #: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "क्रिया"
 
@@ -564,68 +634,128 @@ msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
+"आरंभीकरण पर निक \"अक्षम\" पूछने के लिए, \"सिस्टम\" यूनिक्स खाते लंबे नाम का पुन: "
+"उपयोग."
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr "अतिरिक्त निर्देशिका जो अद्यतन अनुवादों को शामिल कर सकते हैं."
+
+#: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr "बैकअप यूआरएल"
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr "संरक्षित गतिविधियों के बंडल आईडी"
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 "XO प्रतीक के लिए रंग जिसे पूरे डेस्कटॉप में प्रयोग में लिया जाएगा. स्ट्रिंग "
 "को स्ट्रोक रंग तथा भरने के रंग से बनाया गया है तथा आरजीबी रंग फ़ॉर्मेट में "
 "है. उदाहरण: #AC32FF,#9A5200"
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr "किनारा देरी"
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
-msgstr ""
+msgstr "अप्राप्ति फ़ॉन्ट चेहरा"
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
-msgstr ""
+msgstr "अप्राप्ति फ़ॉन्ट का आकार"
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
-msgstr ""
+msgstr "अप्राप्ति निक"
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr "कोना का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी"
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr "किनारा का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी"
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr "अनुवाद के लिए खोज करने के लिए निर्देशिका"
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr "किनारा देरी"
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr "पसंदीदा ख़ाका"
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr "पसंदीदा रेज्यूम मोड"
+msgstr "पसंदीदा पुनरारंभ  मोड"
 
-#: ../data/sugar.schemas.in.h:13
-#, fuzzy
+#: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
 msgstr "प्रयोक्ता नाम जिसका प्रयोग पूरे डेस्कटॉप में किया जाना है."
 
-#: ../data/sugar.schemas.in.h:14
-#, fuzzy
+#: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
 msgstr "प्रयोक्ता नाम जिसका प्रयोग पूरे डेस्कटॉप में किया जाना है."
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr "जीएसएम संजाल APN"
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr "जीएसएम संजाल PIN"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr "जीएसएम संजाल PUK"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr "जीएसएम संजाल पहुँच बिंदु नाम विन्यास"
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr "जीएसएम संजाल संख्या"
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr "जीएसएम संजाल कूटशब्द"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr "जीएसएम संजाल पासवर्ड विन्यास"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr "जीएसएम संजाल व्यक्तिगत पहचान संख्या विन्यास"
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr "जीएसएम संजाल व्यक्तिगत अनलॉक कुंजी विन्यास"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr "जीएसएम संजाल टेलीफोन नंबर विन्यास"
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr "जीएसएम संजाल उपयोगकर्ता नाम"
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr "जीएसएम संजाल नाम विन्यास"
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
@@ -633,109 +763,138 @@ msgstr ""
 "यदि सही है, सुगर हमें जैबर सर्वर के अन्य प्रयोक्ताओं के लिए खोजने लायक बना "
 "देगा."
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "यदि सही है, सुगर \"लॉग आउट\" विकल्प दिखाएगा."
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr "यदि सही है, सुगर \"लॉग आउट\" विकल्प दिखाएगा."
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+"सच तो, Sugar 1,6 चैनल और 11 के लिए डिफ़ॉल्ट तदर्थ संजाल दिखाएगा. यदि Sugar "
+"नहीं \"ज्ञात\" संजाल  देखता है जब यह शुरू होता है, यह नेटवर्क तदर्थ "
+"autoconnect करता है."
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr "जैबर सर्वर"
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr "कुंजीपट ख़ाका"
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr "कुंजीपट मॉडल"
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr "कुंजीपट विकल्प"
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr "पसंदीदा दृश्य का ख़ाका."
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 "कुंजीपट खाका की सूची. प्रत्येक सूची खाका फ़ॉर्म (वेरिएंट) में होनी चाहिए"
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr "कुंजीपट विकल्पों की सूची."
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr "स्वचलित पावर"
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr "स्वचलित पावर."
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr "एक्सट्रीम पावर"
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr "एक्सट्रीम पावर."
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr "गॅजेट में प्रकाशित करें"
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr "आवाज उपकरण को मौन करने के लिए सेटिंग."
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr "लाग आउट दिखाएँ"
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr "पुनः आरंभ दिखाएँ"
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr "Sugar तदर्थ संजाल दिखाएँ"
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr "आवाज मौन है"
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr "कुंजीपट मॉडल जिसे प्रयोग करना है"
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr "सिस्टम के लिए समयक्षेत्र सेटिंग."
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr "प्रयोग किए जाने वाले जैबर सर्वर का यूआरएल."
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr "यूआरएल जहाँ बैकअप सहेजा जाना है."
 
-#: ../data/sugar.schemas.in.h:37
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr "प्रयोक्ता रंग"
 
-#: ../data/sugar.schemas.in.h:38
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr "प्रयोक्ता नाम"
 
-#: ../data/sugar.schemas.in.h:39
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr "प्रयोक्ता नाम जिसका प्रयोग पूरे डेस्कटॉप में किया जाना है."
 
-#: ../data/sugar.schemas.in.h:40
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+"उपयोगकर्ताओं के लिए सूची दृश्य के माध्यम से इन गतिविधियों को मिटा अनुमति "
+"नहीं दी जाएगी."
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr "आवाज़ स्तर"
 
-#: ../data/sugar.schemas.in.h:41
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr "ध्वनि उपकरण के लिए आवाज स्तर."
 
-#: ../data/sugar.schemas.in.h:42
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -766,7 +925,7 @@ msgstr "शुगर -कंट्रोल-पेनल: %s"
 # which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -790,430 +949,510 @@ msgstr ""
 "    -c key       कुंजी का वर्तमान मूल्य साफ करता है \n"
 "    "
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "अपने बदलावो को उपयोग मे लाने के लिए शुगर को पुनरारंभ करे .\n"
 
-#: ../src/jarabe/controlpanel/gui.py:281
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../src/jarabe/controlpanel/gui.py:282
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "परिवर्तनों के लिए कम्प्यूटर फिर से प्रारंभ करना आवश्यक है"
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "परिवर्तनों को रद्द करें"
 
-#: ../src/jarabe/controlpanel/gui.py:290 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "बाद में"
 
-#: ../src/jarabe/controlpanel/gui.py:294
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "अभी फिर से प्रारंभ करें"
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:206
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr "सम्पन्न"
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:333
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "ठीक"
 
-#: ../src/jarabe/desktop/activitieslist.py:236
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr "संस्करण %s"
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr "मिटाने हेतु पुष्टि"
 
-#: ../src/jarabe/desktop/activitieslist.py:359
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "मिटाने की पुष्टि: क्या आप %s को हमेशा के लिए मिटा देना चाहते हैं?"
 
-#: ../src/jarabe/desktop/activitieslist.py:363
-#: ../src/jarabe/frame/clipboardmenu.py:63
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr "रखें"
 
-#: ../src/jarabe/desktop/activitieslist.py:366
-#: ../src/jarabe/desktop/activitieslist.py:409
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:105
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "मिटाएँ"
 
-#: ../src/jarabe/desktop/activitieslist.py:430
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr "पसंदीदा मिटाएँ"
 
-#: ../src/jarabe/desktop/activitieslist.py:434
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr "पसंदीदा बनाएँ"
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr "फ्रीफ़ॉर्म"
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr "रिंग"
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:337
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr "सर्पिल"
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:404
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr "बक्सा"
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:445
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr "त्रिभुज"
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr "पंजीकरण असफल"
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr "पंजीकरण सफल"
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr "आप अब अपने स्कूल के सर्वर से पंजीकृत हो चुके हैं."
 
-#: ../src/jarabe/desktop/favoritesview.py:630
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr "पंजीकृत करे"
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr "फिर पंजीकृत"
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr "सॉफ़्टवेयर अद्यतन"
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 "अपने नये सॉफ़्टवेयर के साथ संगतता सुनिश्चित करने के लिए अपनी क्रियाओं को "
 "अद्यतन करें"
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr "अभी जाँचें"
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr "सूची दृश्य"
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr "पसंदीदा दृश्य"
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:135
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr "कुंजी का प्रकार"
 
-#: ../src/jarabe/desktop/keydialog.py:155
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr "विश्वसनियता का प्रकार"
 
-#: ../src/jarabe/desktop/keydialog.py:220
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 व्यक्तिगत"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr "बेतार सुरक्षा:"
 
-#: ../src/jarabe/desktop/meshbox.py:492
-#, python-format
-#, fuzzy
-msgid "Mesh Network %d"
-msgstr "मेश नेटवर्क  "
-
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:629
-#: ../src/jarabe/frame/activitiestray.py:735
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:65 ../src/jarabe/view/palettes.py:67
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "पुनरारंभ"
 
-#: ../src/jarabe/desktop/meshbox.py:634
-#: ../src/jarabe/frame/activitiestray.py:233
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr "जोड़े"
 
-#: ../src/jarabe/desktop/schoolserver.py:103
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr "Ad-hoc संजाल %d"
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr "मेश नेटवर्क  %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr "सर्वर से कनेक्ट करें नहीं हो सका."
 
-#: ../src/jarabe/desktop/schoolserver.py:108
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr "सर्वर ने निवेदन पूरा नहीं किया."
 
-#: ../src/jarabe/frame/activitiestray.py:238
-#: ../src/jarabe/frame/activitiestray.py:672
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr "अस्वीकार"
 
-#: ../src/jarabe/frame/activitiestray.py:624
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr "%dबा."
 
-#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr "%dकि.बा."
 
-#: ../src/jarabe/frame/activitiestray.py:628
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr "%dमे.बा."
 
-#: ../src/jarabe/frame/activitiestray.py:645
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr "%s इसमें का- %s"
 
-#: ../src/jarabe/frame/activitiestray.py:657
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
-msgstr "%r से हस्तांतरण"
+#, python-format,
+msgid "Transfer from %s"
+msgstr "%s से हस्तांतरण"
 
-#: ../src/jarabe/frame/activitiestray.py:667
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr "स्वीकृत"
 
-#: ../src/jarabe/frame/activitiestray.py:690
-#: ../src/jarabe/frame/activitiestray.py:817
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:724
-#: ../src/jarabe/frame/activitiestray.py:852
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr "खारिज"
 
-#: ../src/jarabe/frame/activitiestray.py:787
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr "अन्य भागीदार फ़ाइल स्थानांतरण रद्द"
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
-msgstr "%r को हस्तांतरित करें"
+#, python-format,
+msgid "Transfer to %s"
+msgstr "%s को हस्तांतरित करें"
 
-#: ../src/jarabe/frame/clipboardmenu.py:53 ../src/jarabe/view/palettes.py:221
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr "हटाएँ"
 
-#: ../src/jarabe/frame/clipboardmenu.py:58
-#: ../src/jarabe/frame/clipboardmenu.py:81
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr "खोलें"
 
-#: ../src/jarabe/frame/clipboardmenu.py:86
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr "के साथ खोलें"
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr "%s क्लिपिंग"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr "आसपडोस"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr "F1"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr "F2"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr "F3"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr "F4"
 
-#: ../src/jarabe/intro/window.py:128
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "नाम:"
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr "रंग बदलने के लिए दबाए"
 
-#: ../src/jarabe/intro/window.py:192 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr "पीछे जाएँ"
 
-#: ../src/jarabe/intro/window.py:209
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "अगला"
 
-#: ../src/jarabe/journal/expandedentry.py:152
-#: ../src/jarabe/journal/palettes.py:59
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr "बिना शीर्षक"
 
-#: ../src/jarabe/journal/expandedentry.py:243
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr "कोई पूर्वावलोकन नहीं"
 
-#: ../src/jarabe/journal/expandedentry.py:262
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr "काइंड: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:262
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/jarabe/journal/expandedentry.py:263
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr "तारीख़: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr "आकार: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:286 ../src/jarabe/journal/misc.py:93
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr "बिना तारीख़"
 
-#: ../src/jarabe/journal/expandedentry.py:293
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr "प्रतिभागी:"
 
-#: ../src/jarabe/journal/expandedentry.py:316
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr "वर्णनः"
 
-#: ../src/jarabe/journal/expandedentry.py:341
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr "चिप्पियाँ:"
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "चिठ्ठा"
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr "ढूंढें"
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr "कभी भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr "आज"
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr "कल से"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr "पिछला हफ्ता"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr "पिछला महीना"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr "पिछला साल"
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr "कोई भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr "मेरे दोस्त"
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr "मेरी कक्षा"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr "कुछ भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:83
-msgid "Copy"
-msgstr "नक़ल"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr "पर प्रतिलिपि बनाएँ"
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr "दूसरी प्रति"
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format, 
+msgid "Error while copying the entry. %s"
+msgstr "%s की प्रतिलिपि ()बनाते समय त्रुटी हुई"
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr "त्रुटि"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:68
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "प्रारंभ"
 
-#: ../src/jarabe/journal/listview.py:373
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr "तिथि के अनुसार छाँटें संशोधित"
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr "तिथि के अनुसार छाँटें बनाया"
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr "आकार के अनुसार छाँटें"
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr "छाटें देखें"
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "आपकी दैनिकी खाली है"
 
-#: ../src/jarabe/journal/listview.py:375
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr "आपके दस्तावेज़ फ़ोल्डर खाली है"
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr "डिवाइस खाली है"
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr "कोई भी मेल खाती हुई प्रविष्टि नहीं है"
 
-#: ../src/jarabe/journal/listview.py:386
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr "खोज साफ करें"
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr "%s की गतिविधि के पुराने संस्करण"
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format, 
+msgid "Do you want to downgrade to version %s"
+msgstr "क्या आप संस्करण %s पर डाउनग्रेड ()करना चाहते हैं ()"
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "आपकी दैनिकी पूरी भरी है"
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 "नई प्रविष्टियों के लिए जगह बनाने के लिए कृपया कुछ पुरानी दैनिकी प्रविष्टियों "
 "को मिटाएँ."
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "दैनिकी दिखाएँ"
 
@@ -1222,110 +1461,341 @@ msgid "Choose an object"
 msgstr "एक वस्तु चुनें"
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr "बंद करें"
 
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr "के साथ बहाल करें"
 
-#: ../src/jarabe/journal/palettes.py:69
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr "के साथ प्रारंभ करें"
 
-#: ../src/jarabe/journal/palettes.py:91
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "प्रविष्टि प्रारंभ करने के लिए कोई क्रिया नहीं"
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr "को भेजें"
 
-#: ../src/jarabe/journal/palettes.py:100
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr "विवरणों को देखें"
 
-#: ../src/jarabe/journal/palettes.py:178
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr "किसी फ़ाइल के बिना प्रविष्टियाँ भेजा नहीं जा सकता."
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr "किसी फ़ाइल के बिना प्रविष्टियाँ नकल नहीं जा सकता."
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr "क्लिपबोर्ड"
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr "कोई मित्र उपस्थित नहीं है"
 
-#: ../src/jarabe/journal/palettes.py:183
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr "कोई भी वैध कनेक्शन नहीं मिला"
 
-#: ../src/jarabe/journal/palettes.py:211
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr "प्रविष्टि बहाल करने के लिए कोई क्रिया नहीं"
 
-#: ../src/jarabe/journal/palettes.py:213
-msgid "No activity to start entry"
-msgstr "प्रविष्टि प्रारंभ करने के लिए कोई क्रिया नहीं"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr "दस्तावेज़"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d मे.बा. रिक्त"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr "युक्ति यन्त्र बदलने के लिए कारण अज्ञात है."
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr "परिवर्तन सामान्य है."
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr "डिवाइस अब प्रबंधित है."
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr "डिवाइस अब प्रबंधित नहीं है."
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr "युक्ति विन्यास के लिए सुसज्जित नहीं सकता."
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+"आईपी ​​विन्यास (उपलब्ध नहीं पता, मध्यांतर, आदि) आरक्षित नहीं किया जा सकता "
+"है."
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr "आईपी ​​विन्यास अब वैध नहीं है."
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr "जिन रहस्यों की आवश्यकता थी, वे दिए नहीं गए"
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr "802.1X निवेदक पहुँच बिंदु या प्रमाणीकरण सर्वर से काट दिया."
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr "802.1X निवेदक के कॉन्फ़िगरेशन असफल रहा."
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr "802.1X निवेदक छोड़ दिया है या अनपेक्षित रूप से विफल रहा है."
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr "802.1X निवेदक के प्रमाणित होने में बहुत देर ही गयी"
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr "पीपीपी सेवा समय के भीतर शुरू करने में विफल रहा है."
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr "PPP सेवा अचानक दिस्कोंनेक्ट हो गयी"
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr "PPP सेवा अचानक बंद या विफल हो गयी"
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr "DHCP सेवा की अनुमति दी समय के भीतर शुरू करने में विफल रहा है."
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr "DHCP सेवा ने एक अनुपेक्षित त्रुटी सूचित की"
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr "DHCP सेवा अचानक बंद या विफल हो गयी"
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr "साझा कनेक्शन सेवा प्रारंभ करने में विफल."
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr "साझा कनेक्शन सेवा छोड़ने या अनपेक्षित रूप से विफल रहा है"
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr "AutoIP सेवा प्रारंभ करने में विफल"
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr "AutoIP सेवा एक अनपेक्षित त्रुटि की सूचना दी"
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr "AutoIP सेवा छोड़ दिया है या अनपेक्षित रूप से विफल रहा है."
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr "डायलिंग में विफल रहा है क्योंकि लाइन व्यस्त था."
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr "डायलिंग में विफल रहा है क्योंकि वहाँ कोई डायल टोन नहीं."
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr "डायलिंग में विफल रहा है क्योंकि वहाँ कोई वाहक नहीं."
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr "डायलिंग समयबाह्य हो गया."
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr "डायलिंग में विफल रहा."
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr "मोडेम आरंभीकरण में विफल रहा है"
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr "निर्दिष्ट जीएसएम APN का चयन करने में विफल"
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr "निर्दिष्ट जीएसएम APN का चयन करने में विफल"
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr "संजाल पंजीयन इनकार कर दिया था"
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr "संजाल पंजीयन समयबाह्य हो"
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr "अनुरोध जीएसएम संजाल के साथ पंजीकृत करने में विफल"
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr "पिन जांच करने में विफल."
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr "इस डिवाइस के लिए आवश्यक फर्मवेयर लापता है."
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr "डिवाइस हटा दिया था"
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr "NetworkManager सो गया."
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr "डिवाइस सक्रिय कनेक्शन हटा या गायब हो गया था"
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr "एक उपयोगकर्ता या ग्राहक के वियोग का अनुरोध किया"
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr "डिवाइस कैरियर / लिंक बदल गया"
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
-msgstr "दोस्त को हटाएँ "
+msgstr "दोस्त को हटाएँ"
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr "दोस्त बनाओ"
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "बन्दकरें"
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "पुनः आरंभ करें"
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr "लॉगआउट"
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr "मेरे सेटिंग"
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
-msgstr " % s निमंत्रित करें "
+msgstr "%s निमंत्रित करें"
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr "<b>%s</b> प्रारंभ करने में विफल."
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "शुरू हो रहा है"
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr "गतिविधि शुरू होने में विफल रही"
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:74
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr "स्रोत देखें"
 
-#: ../src/jarabe/view/palettes.py:85
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "रूकें"
 
-#: ../src/jarabe/view/palettes.py:125
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr "नया प्रारंभ करें"
 
-#: ../src/jarabe/view/palettes.py:174
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "सामग्री दिखाएँ"
 
-#: ../src/jarabe/view/palettes.py:196 ../src/jarabe/view/palettes.py:246
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d मे.बा. रिक्त"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr "हटाएँ"
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
-msgstr "इंस्टैंस स्रोत"
+msgstr "उदाहरण स्रोत"
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr "स्रोत"
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr "क्रिया बंडल स्रोत"
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr "सुगर औज़ारसंग्रह स्रोत"
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr "स्रोत देखें: %r"
 
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr "एक खिड़की में शुगर"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr " सम्पर्क तोडे"
+
+#~ msgid "Create new wireless network"
+#~ msgstr "नया वायरलेस नेटवर्क बनाएँ"
+
+#, python-format
+#, fuzzy
+#~ msgid "%s's network"
+#~ msgstr "%s का नेटवर्क %s"
+
+#~ msgid "Copy"
+#~ msgstr "नक़ल"
+
 #~ msgid "Title"
 #~ msgstr "शीर्षक"
 
diff --git a/po/ht.po b/po/ht.po
index 86a54e2..2ac7225 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-03-12 09:14-0400\n"
 "Last-Translator: Jude Augusma <jayme2901@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,236 +15,886 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "Non"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Erè nan modifikatè endike koulè yo"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Erè nan koulè endike yo"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "Klike pou chanje koulè"
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "Retounen"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Fini"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Pa disponib"
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "Prochen"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "Retire zanmi"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "Fè zanmi"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Erè lè lokal pa egziste."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
-msgstr "Envite sou %s"
+msgid "%s seconds"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "Retire"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "Louvri"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Pa ka rantre %s. Kreye reglaj estanda"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Objè ekritwa: %s."
+msgid "Language for code=%s could not be determined."
+msgstr "Lang pou kod=%s pa ka tèmine."
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Tip kle:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Mwen regrèt mwen pa pale '%s'."
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Tip otantifikasyon:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Tip kod sekrè"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
-msgstr "Ekran projektwa"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Yo pa konnen eta l'"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Erè nan itilizasyon limen/etenn agiman radio endike-a. "
+
+#: ../extensions/cpsection/network/model.py:140
 #, fuzzy
-msgid "Disconnect"
-msgstr "Dekonekte"
+msgid "Error in specified argument use 0/1."
+msgstr "Erè nan itilizasyon limen/etenn agiman radio endike-a. "
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:118
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
-msgid "Disconnecting..."
-msgstr "Dekonekte..."
+msgid "None"
+msgstr "Fini"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Retire"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
+msgstr "Dekonekte"
 
 # Only show disconnect when there's a mesh device, because mesh takes
 # 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
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 #, fuzzy
 msgid "Connecting..."
 msgstr "Dekonekte..."
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
-msgstr "Rezo "
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
-msgstr "Dekonekte..."
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Chanèl"
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
-msgstr "Repwann"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
-msgstr "Rankontre"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
 
-#: ../src/view/devices/battery.py:42
-msgid "My Battery"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
-msgid "Charging"
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
-msgid "Very little power remaining"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Dekonekte"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%(hour)d:%(min).2d remaining"
+msgid "Error: %s"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
-msgid "Charged"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Rezo "
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "Rezo "
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
-msgstr "Dekonekte"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
-msgstr "Chanèl"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "Vwazinaj"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Gwoup"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Lakay"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Aktivite"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Ekran projektwa"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "Sugar-kontwòl-panèl: kle=%s pa yon opsyon disponib"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "Sugar-kontwòl-panèl: %s"
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -254,293 +904,879 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Sèvi: Sugar-Kontwòl-panèl [opsyon] kle [args ... ]\n"
-"	Kontwòl pou anvironman sugar. \n"
-"	opsyon: \n"
-"	-h	montre mesaj èd sa epi soti \n"
-"	-l	fè lis tout opsyon disponib yo \n"
-"	-h kle	montre enfòmasyon sou kle sa \n"
-"	-g kle	pwan valè kouran kle-a \n"
-"	-s kle	fikse valè Kouran pou kle-a \n"
-"	"
-
-#: ../src/controlpanel/cmd.py:45
+"\tKontwòl pou anvironman sugar. \n"
+"\topsyon: \n"
+"\t-h\tmontre mesaj èd sa epi soti \n"
+"\t-l\tfè lis tout opsyon disponib yo \n"
+"\t-h kle\tmontre enfòmasyon sou kle sa \n"
+"\t-g kle\tpwan valè kouran kle-a \n"
+"\t-s kle\tfikse valè Kouran pou kle-a \n"
+"\t"
+
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Pou aplike chanjman ou yo ou bezwen reyinisyalize program nan.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr ""
-
-#: ../src/controlpanel/toolbar.py:121
-msgid "Ok"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
-msgstr ""
-
-#: ../src/controlpanel/gui.py:253
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Fini"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "stroke:   %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "%s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Enskri"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Tip kle:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Tip otantifikasyon:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Repwann"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Rankontre"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "fill:     %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
-msgstr "Erè nan modifikatè endike koulè yo"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Rezo "
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
-msgstr "Erè nan koulè endike yo"
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "Pa disponib"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "Erè lè lokal pa egziste."
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-#, fuzzy
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "Pa ka rantre %s. Kreye reglaj estanda"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "Lang pou kod=%s pa ka tèmine."
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Mwen regrèt mwen pa pale '%s'."
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "Yo pa konnen eta l'"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "Erè nan itilizasyon limen/etenn agiman radio endike-a. "
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
+#: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
-msgid "Click to change your color:"
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Retire"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Louvri"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Vwazinaj"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Non"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr "Klike pou chanje koulè"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Retounen"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Prochen"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
-msgstr "Konekte sou rezo lekòl la"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
-msgstr "Ap chache rezo lekòl la"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
-msgstr "Konekte sou yon rezo XO"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Ap chache yon rezo XO..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
-msgstr "Konekte sou yon senp rezo"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
-msgstr "Kòmanse yon senp rezo"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
-msgstr "Rezo non idantifye"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Retire zanmi"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Fè zanmi"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "Fèmen"
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
-msgstr "Enskri"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Envite sou %s"
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "ap louvri"
 
-#: ../src/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Stope, rete"
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Retire"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../src/view/palettes.py:169
-msgid "Show contents"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Objè ekritwa: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Tip kod sekrè"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#, fuzzy
+#~ msgid "Disconnecting..."
+#~ msgstr "Dekonekte..."
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr "Dekonekte..."
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Konekte sou rezo lekòl la"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Ap chache rezo lekòl la"
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Konekte sou yon rezo XO"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Ap chache yon rezo XO..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Konekte sou yon senp rezo"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Kòmanse yon senp rezo"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Rezo non idantifye"
+
 #~ msgid "off"
 #~ msgstr "Etenn"
 
diff --git a/po/hu.po b/po/hu.po
index 63d4e34..7fd0d5d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/hus.po b/po/hus.po
new file mode 100644
index 0000000..c74e3d9
--- /dev/null
+++ b/po/hus.po
@@ -0,0 +1,1845 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: 2011-10-17 15:18+0200\n"
+"Last-Translator: Francisco <fordazmx@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hus\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Tin kwentaj nana'"
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "In yejenchál ka otsba' jun i bijláb."
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "walte'líl:   mukuxtaláb=%s in tajáx=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "walte'líl:   %s"
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "bú'chudh:     mukuxtaláb=%s in tajáx=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "bú'chudh:     %s"
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Uk'pintaláb ti jalk'uxchik k'al an takudh mukuxtaláb."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Uk'pintaláb ti mukuxtaláb takudh."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Klik abal ki jalk'uy an mukuxtaláb:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "Tin kwentaj u ábatnom pat'al"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Yab jolat"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Ibil"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "In áy an ajixtaláb pat'ál:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Software"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Inkixtaláb:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr "Firmware k'al an yab tsájlidh polts'oxtaláb:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "K'ij ani in alwa'taláb an tsejk'om"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+"Sugar pel an waldhuchumtaláb axi tata' it eyendhom kwajat a tsu'tal. Sugar "
+"pel i jólat software, pel jún i jólataláb xi in binal an GNU Licencia "
+"Pública General, ani kw'ajat it kanidh abal ka jalk'uy ani ka buk'uw i "
+"k'ot'bidh dhuchlab k'al junchik i jólat xi dhuchadh tin ebal jajá'."
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "Putat jólataláb:"
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Ajumtal a k'íj ani pejach k'íj"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Uk'pintaláb, an xe'éts k'íj yab wa'ats."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Xe'éts k'íj"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Pek'madh t'iplab"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "In jalbíl in yejenchal jún i putat ajixtaláb."
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "ni jáyk'i'"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "jun adhík"
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr "%s i adhik'íj"
+
+# jilk'ontaláb=retraso
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Jilk'ontaláb k'al an edhomtaláb"
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Xúts"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Walte'líl"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr "Dhuchumtaláb"
+
+# Nits'bixtaláb modelo
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr "Nits'bixtaláb an dhuchumtaláb"
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr "Dhuche'(chik) abal ki jalk'uy an walek"
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr "Walek(chik) k'ál an dhuchumtaláb"
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Kawintaláb"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+"Yáb ka ejtow kit otsits' ti ~/.i18n. Ka ts'ejka' jun i dhéy t'ojojóxtaláb ti "
+"tsabál."
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "An kawintaláb an dhuche'=%s ibáj elchin in exbádh."
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Pakw'ulanchij, ibáj in káw '%s'."
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+"Punk'uy i kawintaláb jant'odha' tata' ka le'na' k'a k'elbay. Max jun i "
+"wenk'oxtaláb ibáj kwa'jat, ne'ets ka eyan xi junake' axi ti k'elab."
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr "T'ojojóxtaláb k'al an pat'ál polts'oxtaláb"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr "Bijláb an eyendhom:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr "Tsinatbijiláb:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr "Ajixtaláb:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr "Bijláb k'al an tuk otseltaláb (APN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr "Ajixtaláb exlomtaláb k'al an atikláb (PIN):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr "Kwetem japix exbadhdhuche' (PUK):"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+"Yejenchál ka bina' an olchixtaláb abal an t'ojojóxtaláb ani ka ts'ot'k'oy in "
+"pulik belíl (3G) ti polts'oxtaláb k'al an tsipti t'ilom pat'al."
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Polts'oxtaláb"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Yab éxladh ti kwajat."
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+"Uk'pintaláb tin ebal an ódhaxtaláb xi exbadh ti p'atal wat'bom káw ka "
+"ayendha' on/off."
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr "Uk'pintaláb tin ebal an ódhaxtaláb xi exbadh ka ayendha' 0/1."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Yab ts'ájlidh"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+"Ka tepdha' an yab ts'ájlidh p'atal wat'bom káw ani yab ka odhna'chikiy in "
+"éjatal an mulkux tsapláb"
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "P'atal wat'bom káw"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+"Ka t'ixk'a' an t'ilab tin ebal an polts'oxtaláb max wa'ats i káw k'al an "
+"ts'ot'k'oxtaláb"
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr "Ka t'ixk'a' an t'ilab tin ebal an polts'oxtaláb"
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr "Dhéyetnaxtaláb"
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"An tólmix buk'ul játs ejtil an altáj jutaj tit kwa'ajatchik; an atiklabchik "
+"ti bá' an tólmix buk'ul in ejtowalchik ka tsu'uxinchik, abal ani' yab "
+"jayetsej an polts'oxtaláb."
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Tólmix buk'ul:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Tsapiktaláb"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+"K'ibts'ontaláb ti kwetem odhaxtaláb tin ebal an tsapík abatnomtaláb, ka "
+"eyendha' on/off."
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+"K'ibts'ontaláb ti tsapík abatnomtaláb ti ódhaxtaláb, ka eyendha' on/off."
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "An tsapík abatnomtaláb"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "Kwetem tsapík abatnomtaláb (in punk'unchál in ejatál an mulkux tsapláb)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+"Ka k'adhpidh ayendha' an tsapiktaláb (in k'anchál an yab ts'ajlidh pat'al "
+"wat'bom káw, in yanedhal in ejatal an mulkux tsapláb)"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr "Itmedha' an software"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+"An itmedhomtaláb k'al an software in alwa'medhal an k'ibts'ontaláb, in "
+"tixk'al patal an biltaláb ti belenaxtaláb ani in binál pil in alwa'."
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr "Takaxtaláb %s..."
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr "Pa'bál %s..."
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr "Itmedhom %s..."
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr "Kw'ajat itmedhách an software"
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] "A ejtowal ka punk'uy %s i itmedhomtaláb"
+msgstr[1] "A ejtowal ka punk'uy %s i itmedhomtalabchik"
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr "Alimchikál i itmedhomtaláb..."
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr "In punk'uyal an itmedhomtalabchik..."
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] "%s i itmedhomtaláb puk'uyat"
+msgstr[1] "%s i itmedhomtalab puk'uyat"
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr "Takudh punk'uxtaláb"
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr "In puweltal an pa'banelom: %s"
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr "Ti áyláb %(current)s ma ti %(new)s (Size: %(size)s)"
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr "Mani jún"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr "1 KB"
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr "%.0f KB"
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "U mulkux tsaplab"
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr "Pakudh"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "T'uchél"
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "Jilk'onal lej we'káts in tsapík an mulkux tsaplab"
+
+# Do not translate these variable names - cjl
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "Jilk'onal %(hour)d:%(min).2d"
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "T'uchat"
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr "IP belil: %s"
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Ka t'ixk'a ti ts'ot'k'oxtaláb"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "In t'sot'k'oyal..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "T'sot'k'odh"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr "Yab wa'ats i yab ts'ajlidh ts'ot'k'ontaláb"
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "In belíl"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr "Tsájlidh polts'oxtaláb"
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr "Adhiktaláb"
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr "Yab tsájlidh patál polts'oxtaláb"
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr "Pakwlanchij aychij jún we'..."
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Ka ts'ot'k'oy"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Yab ts'ot'k'odh"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "T'apiy"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr "Ka exa' an ts'ot'k'ox junilik'íj"
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr "K'ibts'ontaláb: %s"
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr "Tsalpaxtaláb: %s"
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr "Ts'ot'k'odh ti %s"
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr "%d KB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr "Ka tsab met'a' an t'ojojóxtaláb k'al a Pin/Puk."
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr "Ka tsab met'a' an t'ojojóxtaláb k'al in bij an tuk abal an otsits (APN)"
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr "Ka tsab met'a' an ajixtaláb k'al an t'ojojóxtaláb."
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr "Ka tsab met'a' an t'ojojóxtaláb."
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Dhikab polts'oxtaláb"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr "Dhikab polts'oxtaláb %s"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr "Yab wa'ats i ts'ot'k'oxtaláb GSM."
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr "Inkiy jun i ts'ot'k'oxtaláb ti ok'nom mét'nib."
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr "U kawidh ayendhanelil"
+
+# Kawindha'   dar voz
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr "Kawindha'"
+
+# Silenciar Ts'ibatmedha'
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr "Ts'ibatmedha'"
+
+# Chu'chub dedo
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr "ch'uchub"
+
+# In alwá' estilo
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr "in alwá'"
+
+# U jolát takaxtaláb mi superficie tactil
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr "U jolát takaxtaláb"
+
+# Dhikab Malla
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "Dhikab"
+
+# Mudhél   Grupo
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "Mudhél"
+
+# Tujtal Hogar
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "Tujtal"
+
+# T'ojláb Actividad
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "T'ojláb"
+
+# k'ot'bidh walek=Captura de pantalla
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "K'ot'bidh walek"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr "K'otbidh walek a \"%s\""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+"\"disabled\" (yab walkadh) abal kin konoy an odhbijíl tin tujtál; \"system\" "
+"(púweltal) abal kin tsab ayendha' an nakat bijiláb ti ba' in áy a UNIX."
+
+# wenk'oxtaláb káw  traducciones
+# directorio=carpeta
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+"Pilchik i dhayab-úw axi in ejtowal ki in ko'oy i itmedhach wenk'oxtaláb káw."
+
+# k'otbiy ani dhayach  Respaldo
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr "URL ti k'otbiy ani dhayach"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr "Bundle IDs k'al an k'anidh t'ojláb"
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"In mukuxtaláb an t'iplab k'ál an XO xi eyendhab tin walekdhuchumtaláb. An "
+"dhuchlab tsejk'adh k'al jun i kits'láb ani t'uchat k'al i mukuxtaláb, an "
+"t'ipodh játs axi pilchik i mukuxtaláb RGB. T'ipodhits: #AC32FF,#9A5200"
+
+# xu'utsunchik  esquinas
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr "Jilk'ontaláb ti ba' in xu'utsunchik"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr "Ok'xidh bijidh in k'otbil an dhuche'"
+
+# Ok'xidh bijidh predeterminado
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr "Ok'xidh bijidh in puwel an dhuche'"
+
+# ódhbij  apodo
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr "Ok'xidh bijidh ódhbij"
+
+# walkadhtaláb  activacion xu'utsun esquinas
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+"Jilk'ontaláb abal an walkadhtaláb ani tam ki eyendha' in xu'utsun an tse' in "
+"walte'."
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+"Jilk'ontaláb abal an walkadhtaláb tam ki eyendha' in walte'líl an tse' in "
+"walte'."
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr "Dhayab-úw abal ki aliy an wenk'oxtaláb káw"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr "Jilk'ontaláb k'al in walte'líl"
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr "Tsalpadh t'iplab xa kulbetnal"
+
+# xa kulbetnal  favoritos
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr "Jant'odha' ti ki tsab wichk'ow a xa kulbetnal"
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr "In alwá' an dhuche' axi u eynal ti patal an walekdhuchumtaláb."
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr "In puwél an dhuche' axi u eynal ti patal an walekdhuchumtaláb."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr "APN ti al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr "PIN ti al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr "PUK ti al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+"An t'ojojóxtaláb k'al in bij an tuk abal an otsits (APN) k'al an "
+"polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr "Ajixtaláb k'al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr "Tsinat bijiláb k'al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr "An t'ojojóxtaláb tsinat bijiláb k'al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+"An t'ojojóxtaláb ti ajixtaláb k'al an kweten exlomtaláb (PIN) polts'oxtaláb "
+"GSM"
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+"An t'ojojóxtaláb ti exbadh dhuche' k'al an kwetem walkaxtaláb (PUK) "
+"polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+"An t'ojojóxtaláb k'al an ajixtaláb ti tsipti t'ilóm pat'ál k'al an "
+"polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr "In bijlabil an eyendhom k'al an polts'oxtaláb GSM"
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr "T'ojojoxtaláb k'al in bijlabil an eyendhom k'al an polts'oxtaláb GSM"
+
+# walka' habilitar, walkatalab activacion
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"Max pél i TRUE, Sugar ne'ets kin walka' abal pilchik i eyendhom ti ku aliy "
+"ti tólmix buk'ul Jabber."
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+"Max pél i TRUE, Sugar in tejwa'medhal jun i jolat takudhtaláb \"Putundha' an "
+"t'ojláb\"."
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+"Max pél i TRUE, Sugar in tejwa'medhal jun i jolat takudhtaláb \"Tsab tujchij\" "
+"an t'ojláb."
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+"Max pél i TRUE, Sugar in tejwa'medhal i ok'xidh uludh polts'oxtaláb Ad-hoc "
+"tin belíl 1,6, ani 11. Max a Sugar yab kin tsu'uw i \"exladh\" polts'oxtaláb "
+"tam kin tujuw, ne'ets ka kwetem ts'ot'k'on ba juni polts'oxtaláb Ad-hoc."
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr "Tolmix buk'ul Jabber"
+
+# Búk'láts=distribuciones
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr "Búk'láts k'al an dhuchumtaláb"
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr "Nits'bixtaláb k'al an dhuchumtaláb"
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr "Jolat takudhtaláb ti dhuchumtaláb"
+
+# Búk'láts Distribucion
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr "Búk'láts k'al an t'ojlábchik xa kulbetnal."
+
+# pilmedhóm variante
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+"K'elab k'al an búk'láts k'al an dhuchumtaláb. An otseltaláb in yejenchal kin "
+"t'aja' jant'odha' ti búk'ládh(pilmedhóm)"
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr "K'elab k'al i jolat takudhtaláb ti dhuchumtaláb."
+
+# kwetem  automatico     bledhóm  manejo conducir
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr "Kwetem beldhóm tsapiktaláb"
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr "Kwetem beldhóm tsapiktaláb."
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr "K'adhpidh beldhomtaláb k'al an tsapiktaláb"
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr "K'adhpidh beldhomtaláb k'al an tsapiktaláb."
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr "Ki tejwa'mejdha' ti Gadget"
+
+# tsi'batmedha'
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr "T'ojojóxtaláb abal ki tsi'batmedha' an punk'udh janidh eyendhanél."
+
+# Tejwa'mejdha' Mostrar
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr "Tejwa'mejdha' Putundha' T'ojláb"
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr "Tejwa'mejdha' Tsab tujchij"
+
+# uchbidh especificas
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr "Tejwa'medha' an uchbidh polts'oxtaláb k'al an Sugar"
+
+# Ts'ibatmedhach  silenciado
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr "Janídh Ts'ibatmedhach"
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr "An nits'bixtaláb dhuchumtaláb xi ne'ets ka eyán"
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr "T'ojojóxtaláb ti xe'ets k'íj abal tin puwéltal."
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr "URL an tólmix buk'ul Jabber abal ki eyendha'."
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr "URL jutaj ki dhaya' an backup."
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr "An mukuxtaláb k'al an ayendhom"
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr "Bijláb an ayendhom"
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr "Bijláb an ayendhom axi u eynal ti walekdhuchumtaláb."
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+"Axe'chik xi ayendhom yab walkadh kin pakuw an t'ojláb ti ba' an k'elab "
+"walek."
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr "In bajúdh an kawídh"
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr "Kawidhtaláb abal an puk'udh janidh ayendhanél."
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"Tam it t'wat ti wichenchij walek, max ki taja' klik ti t'iplab k'al xa "
+"kulbetnal in t'ajal abal ki wichenchij ti taltaláb otseltaláb xi ba' an "
+"t'ojláb."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: OK'XIDH ÓLCHIXTALÁB, wa'ats yan i jolat takudhtaláb "
+"k'al jayetsej in bij: %s kwenelidh: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+"sugar-control-panel: tsinatbijláb =%s yab ja' i jolat takudhtaláb xi kwajat "
+"walkadh"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+#, python-format,
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"Ayendhab: sugar-control-panel [ jolat takudhtaláb ] tsinatbijiláb [ args... "
+"] \n"
+"    Ábatnom abal an walek sugar. \n"
+"    Jolat takudhtaláb: \n"
+"    -h           ka tejwa'mejdha' axe' xi ólchixtaláb tolmixtaláb ani kit "
+"kalej \n"
+"    -I           ka ajixliy patal an jolat takudhtaláb xi walkadh \n"
+"    -h tsinatbijiláb       ka tejwa'mejdha' an ólchixtaláb abal axé xi "
+"tsinatbijiláb \n"
+"    -g tsinatbijiláb       in bats'uwal in jalbil an tsinatbijiláb \n"
+"    -s tsinatbijiláb       in kwajbál in jalbil an tsinatbijiláb \n"
+"    -c tsinatbijiláb       in t'okal in jalbil an tsinatbijiláb \n"
+"    "
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Abal ka dhaya' axi a jalk'uy in yejenchal ka tsab tujchij sugar.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Ok'xidh ólchixtaláb"
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr "An jalk'untaláb in yejenchal ka tsab tujchij"
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr "T'apiy axi a jalk'uy"
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "Talbel"
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr "Ka tsab tujchij xowé'"
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "T'ajadh"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Aníts"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr "Áyláb %s"
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Tsabtoktsiy ani ka pakuw"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Tsabtoktsiy ani ka pakuw: ¿A le' ka pakuw %s abal eytsey?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Dhaya'"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Pakuw"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Pakuw xa kulbetnal"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "Ka taja' xa kulbetnal"
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "Jólat t'ipoxtaláb"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "Kwechodhtaláb"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr "Yunk'íx"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr "Balixtaláb"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr "Óx in ts'uptal"
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "K'ibts'ontaláb ti dhuchláts"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "Alwa' an dhuchláts"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "Xowe' kw'ajat it dhuchadh ti tólmix buk'ul xi ti atáj exobintaláb."
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Dhuchantaláb"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr "Kit tsab dhuchan"
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr "Itmedhomtaláb k'al an software"
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Ka itmejdha' an t'ojlábchik abal ka tsu'uw max jununúl k'al an ít software"
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "Ka taka' xok'ij"
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "Tsu'uw ti k'elab"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "Tsu'uw xa kulbetnal"
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Alwá' an tsinatbijiláb:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Ki exla' in chubax éy k'al an dhuche':"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr "WPA ani WPA2 kwetemtal"
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr "Yab tsajlidh beletnaxtalab:"
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Áynanchij"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Kit junkun"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr "Polts'oxtaláb Ad-hoc %d"
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr "Polts'oxtaláb dhikadh %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "Ibáj ka ejtow ka ts'ot'k'oy k'al an tólmix buk'ul."
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "An tólmix buk'ul ibáj in ejtow kin putundha' an konoxtaláb."
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Yab ka bats'uw"
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr "%s k'al %s"
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr "Wat'ba' ma ti %s"
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr "Anits"
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr "Ka t'ixk'a'"
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr "Wat'ba' ti pil %s"
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Pakuw"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Japiy"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Ka japiy k'ál"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr "kotodh ti %s"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Át k'imádh"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr "F1"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr "F2"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr "F3"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr "F4"
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Bijlab:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Klik abal ka jalk'uy an mukuxtaláb:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Kuxláb"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Okóx"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "Yab bijidh"
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "Yab ók'xidh tejwa'mejdhach"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr "Alwá': %s"
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr "Yab éxladh"
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr "Ajumtal íts': %s"
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr "Puwél: %s"
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "Yab ajidh tin ajumtal íts'"
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "Tolmixchik t'ojláb:"
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "Tejwa'mejdhomtaláb:"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "Dhuchadh ts'at'at' úw:"
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "Chudhél dhuchlab"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Aliy"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr "Jawa'kits tam k'ij"
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr "Xowe'"
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr "Ma ti we'el"
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr "Ti wat'ey búk a k'icháj"
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr "Ti wa'tey a its'"
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr "Ti wa'tey a tamub"
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr "Jawa'kits"
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr "U ja'ubchik"
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr "U exobintalábil"
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr "Jawa'kits"
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr "Ka k'ot'biy ti"
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr "Tsábedha'"
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr "K'ibts'ontaláb tam ti k'ot'biy an otseltaláb. %s"
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr "K'ibts'ontaláb"
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Tujtal"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr "Ka k'elbay tin ajumtal íts' tam ti jalk'uyat"
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr "Ka k'elbay tin ajumtal íts' tam ti ts'ejka'"
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr "Ka k'elbay k'al in puwél"
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr "K'elbadh ti ka tsu'uw"
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr "A chudhél dhuchlab kwa'ajat jolat"
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr "Yab wa'ats i otseltaláb xi junkudh"
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr "T'oka' an alimtaláb"
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr "Áyláb lej biyalits k'al an t'ojláb %s"
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr "¿A le' ka punuw an áyláb %s, xi lej biyalits?"
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr "A chudhél dhuchlab kwa'ajat t'uchat"
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+"T'ajchij an alwa'taláb ka pakuw junchik i biyal otseltalab ti chudhél "
+"dhuchlab abal ki jolk'a' abal xi an it otseltaláb."
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr "Tejwa'medha' an Chudhél dhuchlab"
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "Ka takuy juni eyextaláb"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "Mápuy"
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr "Tsab tujchij k'al"
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr "Tujchij k'al"
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "Yab elan juni t'ojláb abal ki tujchij an otseltaláb"
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr "Abna' abal"
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr "Ka tsu'uchij in alwa'tal"
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr "An otseltaláb max yab in kwa'al jun i dhuchlab ibáj ki ejtow ka abna'."
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr "Otseltal max yab k'al jun i dhuchlab ibáj ka ejtow ka k'ot'biy."
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr "Kitnom-úw"
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr "Tejé' inbáj wa'ats i ja'ubláb"
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr "Inbáj elan i uchbidh ts'ot'k'oxtaláb"
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr "Inbáj elan juni i t'ojláb abal ki wichenchij an otseltaláb"
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr "Dhuchlab"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB jolat"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+"In uchbídh abal ka jalk'un jant'odh ti kwajat an punk'udh ayendhanél ibáts "
+"exladh."
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr "An jalk'untaláb jant'odh ti kwa'ajat ajná'its."
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr "An punk'udh ayendhanél kwajat ti t'ojojoyáb."
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr "An punk'udh ayendhanél yabats kwajat ti t'ojojoyáb."
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr "An punk'udh ayendhanél ibáj ejtowat ka ts'ejkan abal an t'ojojoxtaláb."
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+"An t'ojojoxtaláb IP ibáj ejtowat ka jilaxna' takudh (kom inbáj wa'ats i "
+"punk'uxtaláb ti k'ij eleb, pilchik)."
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr "An t'ojojoxtaláb IP yabáts bats'udh."
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr "Yejenchabak i tsinatbijláb, ani yab odhamej."
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+"An ts'a'um 802.1X kotonchat an tuk otseltaláb o juti ts'ot'k'odh k'al tólmix "
+"buk'ul tin alwa'."
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr "An t'ojojoxtaláb k'al an ts'a'um 802.1X k'ibts'on."
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr "An ts'a'um 802.1X in jila' o max i inbáj in tso'obim k'ibts'on."
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+"An ts'a'um 802.1X léj in k'ibamal yan a k'ij abal kin ona' abal chubax "
+"jaja'."
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr "An tolmixtaláb PPP k'ibts'onenek abal kin tujchij ti walkadh k'ij."
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr "An tolmixtaláb PPP t'apin tam ti yab in t'ilom an ts'otk'odhtaláb."
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr "An tolmixtaláb PPP in jila' o yab in tso'obim ani k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr "An tolmixtaláb DHCP k'ibts'on abal kin tujchij ti walkadh k'ij."
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+"An tolmixtaláb DHCP in tejwa'mejdhal jun i K'ibts'ontaláb xi yab i tso'obim."
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr "An tolmixtaláb DHCP in jila' o adhik k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+"An pejchixnadh tolmixtaláb ts'ot'k'odhtaláb k'ibts'onenek tam tin tujuw."
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+"An pejchixnadh tolmixtaláb ts'ot'k'odhtaláb in jilamal o lej adhik "
+"k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr "An tolmixtaláb AutoIP k'ibts'onenek tan tin tujuw."
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr "An tolmixtaláb AutoIP in tejwa'mejdhal jun adhik k'ibts'ontaláb."
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr "An tolmixtaláb AutoIP in jila' o adhik k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr "An ts'ot'k'oy k'ibts'onenek kom an tsáj ts'ot'k'ol lej eyadh."
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr "An ts'ot'k'oy k'ibts'onenek kom an tsáj káw lej eyendhach."
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr "An ts'ot'k'oy k'ibts'onenek kom yab wa'atsin an ne'edhach."
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr "An kanixtaláb káw taley k'al an k'ij."
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr "An kanixtaláb káw k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr "K'ibts'onenek ti tujtal an modem."
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr "K'ibts'onenek abal ka takuy an tuk otseltaláb (APN) GSM"
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr "Ibáj aliyab i polts'oxtaláb."
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr "An dhuchantaláb ti polts'oxtaláb yab bats'uwat."
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr "Taley an dhuchantaláb ti polts'oxtaláb."
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr "K'ibts'onenek an dhuchantaláb k'al an konodh GSM polts'oxtalab."
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr "An abatnom PIN k'ibts'onenek."
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr "Wam in k'ibchal juni firmware yejental abal an punk'udh ayendhanél."
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr "An punk'udh ayendhanél tixk'amej."
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr "NetworkManager waydhamej."
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+"An ayendhach ts'ot'k'oxtaláb in k'al an punk'udh ayendhanél tixk'aj o "
+"k'ibenek."
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr "An ayendhom o an ts'a'um in konoy ka tixk'aj an ts'otk'oxtaláb."
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr "An ne'edhom/t'apidhbél k'al an punk'udh ayendhanél jalk'unenek."
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Pakuw an ja'ubláb"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Ku punuw jun i ja'ubláb"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Tepdha'"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Tsab tujchij"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr "Kalej"
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr "U t'ojojoxtalábil"
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Ka kaniy a %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr "<b>%s</b> k'ibts'on tin tujtal."
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Tujchal..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr "Kibts'on an t'ojláb tin tujtal"
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr "Ki tsu'uw in inkintal"
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Kuba'"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr "Tujuw it"
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "Tejwa'medha' in alwa'"
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr "pakuw"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr "Ok'oxbedha' an inkintal"
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr "Inkintal"
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr "In inkintal an t'i'e' t'ojláb"
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr "Inkintal a Sugar Toolkit"
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr "Tsu'uw an dhuche' inkintal: %r"
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr "Sugar ti jun i met'nib"
+
+#~ msgid "Copy"
+#~ msgstr "K'ot'biy"
+
+#~ msgid "Disconnect..."
+#~ msgstr "Disconnect..."
diff --git a/po/id.po b/po/id.po
index 93c6b6e..7fd0d5d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,309 +129,736 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -460,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -474,485 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:258
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/ig.po b/po/ig.po
index 7287d5e..0144e97 100644
--- a/po/ig.po
+++ b/po/ig.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2006-07-07 10:23+0100\n"
 "Last-Translator: Onye, Sylvester <sylvester@wazobialinux.com>\n"
 "Language-Team: Igbo\n"
@@ -16,433 +16,1716 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../shell/PresenceWindow.py:62
-msgid "Who's around:"
-msgstr "Onye nọ ya:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/PresenceWindow.py:104
-msgid "Share"
-msgstr "Òkè"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
 
-#: ../shell/StartPage.py:189
-msgid "Search"
-msgstr "Chọ̀ọ́"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Àzụ́"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:23
-msgid "Forward"
-msgstr "Íhú"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:29
-msgid "Reload"
-msgstr "Bubatagharịa"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../shell/shell.py:333
-msgid "Everyone"
-msgstr "Onyeọbụla"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
 
-#: ../sugar/chat/ChatEditor.py:43
-msgid "Send"
-msgstr "Ziga"
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d year"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d month"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Àzụ́"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Chọ̀ọ́"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Who's around:"
+#~ msgstr "Onye nọ ya:"
+
+#~ msgid "Share"
+#~ msgstr "Òkè"
+
+#~ msgid "Forward"
+#~ msgstr "Íhú"
+
+#~ msgid "Reload"
+#~ msgstr "Bubatagharịa"
+
+#~ msgid "Everyone"
+#~ msgstr "Onyeọbụla"
+
+#~ msgid "Send"
+#~ msgstr "Ziga"
diff --git a/po/is.po b/po/is.po
index a79e711..b0faf7d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 110c316..3079c2a 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,236 +16,886 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "ឈ្មោះ: "
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "កំណែ​សំរាប់​ពណ៌​នេះ​មាន​បញ្ហា"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "ពណ៌​នេះ​មាន​បញ្ហា"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "ដូរ​ព័ណ"
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "ថយ​ក្រោយ"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "រួច​ហើយ"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "មិន​អាច​រក​បាន"
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "ថតទៅ​មុខ"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "ដក​មិត្ត​ចេញ"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "កសាង​មិត្ត​ភាព"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "មានបញ្ហា ។ ដំបន់​ម៉ោង​នេះ​អត់​មាន​ទេ"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
-msgstr "អញ្ជើញទៅ %s"
+msgid "%s seconds"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "យក​ចេញ"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "បើក"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "មិន​អាច​អាន %s បាន​ទេ ។ បង្កើតស្ដង់ដារ​​សំរាប់​ការ​រៀបចំ"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "ក្ដារ​ខ្ទាស់​វត្ថុ: %s."
+msgid "Language for code=%s could not be determined."
+msgstr "កូដ​សំរាប់​ភាលា​ code=%s មិន​អាន​រក​ឃើញ​ទេ"
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "ប្រភេទ​ឆ្នុច: "
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "សូម​ទោស ខ្ញុំ​មិន​ចេះ​និយាយ​ភាសា '%s' ទេ"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "ប្រភេទផ្ទៀង: "
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "ប្រភេទ​អ៊ិនគ្រីប: "
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
-msgstr "រូបថត​អេក្រង់​"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "ស្ថានភាព​មិន​ស្គាល់"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
+
+#: ../extensions/cpsection/network/model.py:140
 #, fuzzy
-msgid "Disconnect"
-msgstr "ផ្ដាច់"
+msgid "Error in specified argument use 0/1."
+msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:118
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
-msgid "Disconnecting..."
-msgstr "ផ្ដាច់បណ្ដាញ"
+msgid "None"
+msgstr "រួច​ហើយ"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "យក​ចេញ"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
+msgstr "ផ្ដាច់"
 
 # Only show disconnect when there's a mesh device, because mesh takes
 # 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
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 #, fuzzy
 msgid "Connecting..."
 msgstr "ផ្ដាច់បណ្ដាញ"
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
-msgstr "បណ្ដាញត"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
-msgstr "ផ្ដាច់បណ្ដាញ"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "ប៉ុស្ដិ៍"
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
-msgstr "បន្ត"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
-msgstr "ចូល​រួម"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
 
-#: ../src/view/devices/battery.py:42
-msgid "My Battery"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
-msgid "Charging"
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
-msgid "Very little power remaining"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "ផ្ដាច់"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%(hour)d:%(min).2d remaining"
+msgid "Error: %s"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
-msgid "Charged"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "បណ្ដាញត"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "បណ្ដាញត"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
-msgstr "ផ្ដាច់"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
-msgstr "ប៉ុស្ដិ៍"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "ភូមិ"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "ក្រុម"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "ផ្ទះ"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "សកម្មភាព"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "រូបថត​អេក្រង់​"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "sugar-control-panel: key=%s ជម្រើស​អត់​មាន​ទេ"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "sugar-control-panel: %s"
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -255,6 +905,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
@@ -265,283 +916,868 @@ msgstr ""
 "-h key show information about this key \n"
 "-g key get the current value of the key \n"
 "-s key set the current value for the key \n"
-"	"
+"\t"
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr ""
-
-#: ../src/controlpanel/toolbar.py:121
-msgid "Ok"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
-msgstr ""
-
-#: ../src/controlpanel/gui.py:253
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "រួច​ហើយ"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "stroke:   %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "%s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "ចុះ​ឈ្មោះ"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "ប្រភេទ​ឆ្នុច: "
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "ប្រភេទផ្ទៀង: "
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "បន្ត"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "ចូល​រួម"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "fill:     %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
-msgstr "កំណែ​សំរាប់​ពណ៌​នេះ​មាន​បញ្ហា"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "បណ្ដាញត"
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
-msgstr "ពណ៌​នេះ​មាន​បញ្ហា"
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "មិន​អាច​រក​បាន"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "មានបញ្ហា ។ ដំបន់​ម៉ោង​នេះ​អត់​មាន​ទេ"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-#, fuzzy
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "មិន​អាច​អាន %s បាន​ទេ ។ បង្កើតស្ដង់ដារ​​សំរាប់​ការ​រៀបចំ"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "កូដ​សំរាប់​ភាលា​ code=%s មិន​អាន​រក​ឃើញ​ទេ"
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "សូម​ទោស ខ្ញុំ​មិន​ចេះ​និយាយ​ភាសា '%s' ទេ"
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "ស្ថានភាព​មិន​ស្គាល់"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
+#: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
-msgid "Click to change your color:"
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "យក​ចេញ"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "បើក"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "ភូមិ"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "ឈ្មោះ: "
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr "ដូរ​ព័ណ"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "ថយ​ក្រោយ"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "ថតទៅ​មុខ"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
-msgstr "ផ្ជាប់នឹង​បណ្តាញ​ត​របស់​សាលា"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
-msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​សាលា"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
-msgstr "ផ្ជាប់​នឹង​បណ្ដាញត​ XO"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
-msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​ XO"
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
-msgstr "ផ្ជាប់​នឹង​បណ្ដាញ​ស៊ីមផល"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
-msgstr "ចាប់​ផ្ដើម​បណ្ដាញ​ស៊ីមផល"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
-msgstr "បណ្ដាញ​គ្មាន​សំគាល់"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "ដក​មិត្ត​ចេញ"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "កសាង​មិត្ត​ភាព"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "បិទ"
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
-msgstr "ចុះ​ឈ្មោះ"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "អញ្ជើញទៅ %s"
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "ចាប់​ផ្ដើម..."
 
-#: ../src/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "ឈប់"
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "យក​ចេញ"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../src/view/palettes.py:169
-msgid "Show contents"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "ក្ដារ​ខ្ទាស់​វត្ថុ: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "ប្រភេទ​អ៊ិនគ្រីប: "
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#, fuzzy
+#~ msgid "Disconnecting..."
+#~ msgstr "ផ្ដាច់បណ្ដាញ"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr "ផ្ដាច់បណ្ដាញ"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "ផ្ជាប់នឹង​បណ្តាញ​ត​របស់​សាលា"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​សាលា"
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "ផ្ជាប់​នឹង​បណ្ដាញត​ XO"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​ XO"
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "ផ្ជាប់​នឹង​បណ្ដាញ​ស៊ីមផល"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "ចាប់​ផ្ដើម​បណ្ដាញ​ស៊ីមផល"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "បណ្ដាញ​គ្មាន​សំគាល់"
+
 #~ msgid "off"
 #~ msgstr "បិត"
 
diff --git a/po/ko.po b/po/ko.po
index a79e711..b0faf7d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/kos.po b/po/kos.po
index 2dac090..d0ee9ab 100644
--- a/po/kos.po
+++ b/po/kos.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 00:31-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2009-09-02 21:21-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,43 +21,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -65,43 +61,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -109,7 +110,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -117,11 +118,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -129,50 +130,50 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr ""
 
@@ -181,75 +182,109 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
@@ -257,363 +292,572 @@ msgstr ""
 msgid "Power"
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:353
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr ""
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr ""
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr ""
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:110
-msgid "Disconnect..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:114
-msgid "Create new wireless network"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:261
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:267
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%s's network %s"
+msgid "Error: %s"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:58
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:60
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:66
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -638,7 +882,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -652,448 +896,498 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:80
-#: ../src/jarabe/journal/listview.py:147
-msgid "Title"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:91
-msgid "Version"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:105
-#: ../src/jarabe/journal/listview.py:178
-msgid "Date"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:234
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:355
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:361
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:364
-#: ../src/jarabe/desktop/activitieslist.py:406
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:427
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:431
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:323
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:671
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:463
-#: ../src/jarabe/frame/activitiestray.py:761
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:468
-#: ../src/jarabe/frame/activitiestray.py:235
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:34
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:51
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:56
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:810
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:164
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:210
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:230
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:231
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:260
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:283
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:309
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:361
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:363
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:374
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
@@ -1102,110 +1396,317 @@ msgid "Choose an object"
 msgstr ""
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:82
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Tui"
 
-#: ../src/jarabe/view/palettes.py:122
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:171
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:218
-msgid "Unmount"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/mg.po b/po/mg.po
index 694551c..78d529d 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 00:31-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2009-05-21 15:10-0400\n"
 "Last-Translator: dina garnier oeliarisoa <dina.garnier.oeliarisoa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,43 +21,39 @@ msgstr ""
 msgid "About Me"
 msgstr "Momba ahy"
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr "Tsy maintsy mampiditra anarana ianao"
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr "Anarana:"
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr "Tsindrio raha hanova ny lokonao:"
 
@@ -65,43 +61,48 @@ msgstr "Tsindrio raha hanova ny lokonao:"
 msgid "About my Computer"
 msgstr "Ny momba ny solosaina"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr "Aoreno:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -109,7 +110,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -117,11 +118,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -129,50 +130,50 @@ msgstr ""
 msgid "Frame"
 msgstr "Faritra"
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr "eo no ho eo"
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr ""
 
@@ -181,75 +182,109 @@ msgstr ""
 msgid "Language"
 msgstr "Fiteny"
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "Tsy fantatra ny fitenin'ny sora-drindra=%s."
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Azafady izaho tsy miteny '%s'."
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "Tsy misy taroby"
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "Fiaraha-miasa"
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "Mpamatsy, Mpizara"
 
@@ -257,364 +292,575 @@ msgstr "Mpamatsy, Mpizara"
 msgid "Power"
 msgstr "Hery, Tanjaka"
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:353
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
 msgid "None"
 msgstr "Vita"
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr ""
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr ""
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr "Esory"
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr "Adiresy IP: %s"
 
-#: ../extensions/deviceicon/network.py:110
-msgid "Disconnect..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:114
-msgid "Create new wireless network"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:261
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:267
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Foano"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format, fuzzy
+msgid "%d KB"
+msgstr "%dKB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
 #, python-format
-msgid "%s's network %s"
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "Avereno ny feo"
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Esory ny feo"
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:58
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:60
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:66
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr "Tahirizo ny URL"
 
-#: ../data/sugar.schemas.in.h:2
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr "Nesorina ny feo"
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr "Url misy ny tahiry."
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr "Lokon'ny mpampiasa"
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr "Anaran'ny mpampiasa"
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr "Fanovàna ny hadirim-peo."
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -639,7 +885,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -653,449 +899,500 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Tandremo"
 
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Foano ny fanovàna"
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Amin'ny manaraka"
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr "Vita"
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr "Foano"
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:80
-#: ../src/jarabe/journal/listview.py:147
-msgid "Title"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:91
-msgid "Version"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:105
-#: ../src/jarabe/journal/listview.py:178
-msgid "Date"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:234
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:355
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:361
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:364
-#: ../src/jarabe/desktop/activitieslist.py:406
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Soloy"
 
-#: ../src/jarabe/desktop/activitieslist.py:427
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:431
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr "Boaty"
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr "Telozoro"
 
-#: ../src/jarabe/desktop/favoritesview.py:323
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr "Nisy olana ny fisoratana anarana"
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr "Vita soa aman-tsara ny fisoratana anarana"
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:671
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr "Voasoratra anarana"
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:463
-#: ../src/jarabe/frame/activitiestray.py:761
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:468
-#: ../src/jarabe/frame/activitiestray.py:235
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:34
-msgid "Cannot obtain data needed for registration."
-msgstr "Tsy azo ny laza ilaina amin'ny fisoratana anarana."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
 
 # je proposerai aussi "Tsy afaka mifandray amin'ny mpamatsy". Cela dépend si on souhaite traduire "server" par "mpizara" ou "mpamatsy".
-#: ../src/jarabe/desktop/schoolserver.py:51
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr "Tsy afaka mifandray amin'ny mpizara."
 
-#: ../src/jarabe/desktop/schoolserver.py:56
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr "Tsy afaka mameno ny fangatahana ny mpamatsy."
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr "%dMB"
 
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr "Ekeo"
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:810
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Fafao"
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr "Sokafy"
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr "Sokafy miaraka amin'ny"
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr "Ny manodidina"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Anarana:"
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr "Tsindrio raha te hanova ny loko:"
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr "Miverina"
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "Manaraka"
 
-#: ../src/jarabe/journal/expandedentry.py:164
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr "Tsy misy lohateny"
 
-#: ../src/jarabe/journal/expandedentry.py:210
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:230
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:231
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:260
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:283
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr "Mombamomba:"
 
-#: ../src/jarabe/journal/expandedentry.py:309
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Firaiketana"
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr "Tadiavo"
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr "Anio, Androany"
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr "Nanomboka omaly"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr "Tamin'ny herinandro lasa"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr "Tamin'ny iray volana"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr "Tamin'ny herin-taona"
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr "Ny olona rehetra"
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr "Ny namako"
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr "Ny kilasiko"
 
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
-msgstr "Adikao"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Atomboy"
 
-#: ../src/jarabe/journal/listview.py:361
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "Tsy misy n'inoninona ao anatin'ny firaiketanao"
 
-#: ../src/jarabe/journal/listview.py:363
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:374
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "Feno ny firaiketanao"
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "Asehoy ny firaiketana"
 
@@ -1104,110 +1401,327 @@ msgid "Choose an object"
 msgstr ""
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr "Akatony"
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr "Alefaso any amin'i"
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr "Jereo ny antsipiriany"
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(toerana_malalaka)d MB Malalaka"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr "Esory io namana io"
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "Pio, Vonoy"
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr "Miala sehatra"
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr "Asehoy ny sora-drindra"
 
-#: ../src/jarabe/view/palettes.py:82
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Ajanony"
 
-#: ../src/jarabe/view/palettes.py:122
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:171
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "Asehoy ny atiny"
 
-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(toerana_malalaka)d MB Malalaka"
-
-#: ../src/jarabe/view/palettes.py:218
-msgid "Unmount"
-msgstr "Esory"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Fafao"
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Cannot obtain data needed for registration."
+#~ msgstr "Tsy azo ny laza ilaina amin'ny fisoratana anarana."
+
+#~ msgid "Copy"
+#~ msgstr "Adikao"
+
+#~ msgid "Unmount"
+#~ msgstr "Esory"
diff --git a/po/mi.po b/po/mi.po
index a45bff2..7fd0d5d 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,104 +129,161 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
@@ -238,229 +291,574 @@ msgstr ""
 msgid "Power"
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -485,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -499,481 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:243
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:202
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 4f5a51f..120da08 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2007-08-08 15:40+0200\n"
 "Last-Translator: Arangel Angov <arangel@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -15,418 +15,1741 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "Име:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "Кликни да смениш боја:"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Назад"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
 msgstr "Завршено"
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "Напред"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "Отстрани пријател"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "Додај пријател"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
 
-#. FIXME check that the buddy is not in the activity already
-#: ../shell/view/BuddyMenu.py:96
-msgid "Invite"
-msgstr "Покани"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
 msgstr "Отстрани"
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "Отвори"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "Додај во дневникот"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Објект од таблата со исечоци: %s"
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Соседство"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
 msgstr "Соседство"
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Група"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Дома"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Активност"
 
-#: ../services/clipboard/objecttypeservice.py:32
-msgid "Text"
-msgstr "Текст"
-
-#: ../services/clipboard/objecttypeservice.py:36
-msgid "Image"
-msgstr "Слика"
-
-#: ../shell/view/Shell.py:285
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr "Слика од екранот"
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "Исклучи"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "Соседство"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "Мојата батерија"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "Батеријата се полни"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "Батерјате се празни"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "Батеријата е наполнета"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "Приватно"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "Мое соседство"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "Зачувај"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "Стоп"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
-#, python-format
-msgid "%s Activity"
-msgstr "%s активност"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
-#, python-format
-msgid "Invite to %s"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
-msgid "Channel"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Завршено"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Зачувај"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Соседство"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Отстрани"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Отвори"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Соседство"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Име:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Кликни да смениш боја:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Напред"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Отстрани пријател"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Додај пријател"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Исклучи"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Стоп"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Отстрани"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
 msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Invite"
+#~ msgstr "Покани"
+
+#~ msgid "Add to journal"
+#~ msgstr "Додај во дневникот"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Објект од таблата со исечоци: %s"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Image"
+#~ msgstr "Слика"
+
+#~ msgid "My Battery life"
+#~ msgstr "Мојата батерија"
+
+#~ msgid "Battery charging"
+#~ msgstr "Батеријата се полни"
+
+#~ msgid "Battery discharging"
+#~ msgstr "Батерјате се празни"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "Батеријата е наполнета"
+
+#~ msgid "Private"
+#~ msgstr "Приватно"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "Мое соседство"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s активност"
diff --git a/po/ml.po b/po/ml.po
index a79e711..b0faf7d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 93c6b6e..7fd0d5d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,309 +129,736 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -460,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -474,485 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:258
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/mvo.po b/po/mvo.po
index e184567..7fd0d5d 100644
--- a/po/mvo.po
+++ b/po/mvo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,221 +16,874 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/intro.py:145
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -240,278 +893,821 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
-msgid "Changes require restart"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:253
-msgid "Cancel changes"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
-msgid "Later"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
-msgid "Restart now"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "stroke:   %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "fill:     %s"
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%s clipping"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/view/palettes.py:71
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:169
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index a96a394..c9cbe82 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-07-26 13:31+0200\n"
 "Last-Translator: Kent Dahl <kentda@pvv.org>\n"
 "Language-Team: Norsk bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -16,234 +16,873 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/intro.py:65
-#: ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "Navn:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Om meg"
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
-msgstr "Klikk her for å endre farge"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "Du må skrive inn et navn."
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "Tilbake"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../src/intro/intro.py:159
-#: ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Ferdig"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "Neste"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "Fjern venn"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "Bli venn"
+#: ../extensions/cpsection/aboutme/model.py:94
+#, fuzzy
+msgid "Error in specified color modifiers."
+msgstr "Feil i de angitte fargemodifikatorene."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Feil i de angitte fargene."
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Klikk for å endre din farge:"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Ikke tilgjengelig"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "Inviter til %s"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "Fjern"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Identitet"
 
-#: ../src/view/clipboardmenu.py:53
-#: ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "Åpne"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Serienummer:"
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-#: ../src/view/home/HomeBox.py:86
-msgid "Keep"
-msgstr "Behold"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Programvare"
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
-msgstr "Åpne med"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Bygg:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+#, fuzzy
+msgid "Firmware:"
+msgstr "Fastvare:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Dato og tid"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Feil: Tidssonen finnes ikke."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Tidssone"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Ramme"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "Verdien må være et heltall."
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "aldri"
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/frame/view.py:28
+#, fuzzy
+msgid "instantaneous"
+msgstr "umiddelbar"
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-#, fuzzy, python-format
-msgid "Clipboard object: %s."
-msgstr "Utklipp: %s"
+msgid "%s seconds"
+msgstr "%s sekunder"
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Nøkkelform:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Aktiveringsforsinkelse"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Autentiseringsform:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Hjørne"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Kant"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Krypteringsform:"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Språk"
 
-#: ../src/view/Shell.py:235
+#: ../extensions/cpsection/language/model.py:30
 #, fuzzy
-msgid "Screenshot"
-msgstr "Skjermbilde"
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Fikk ikke tilgang til ~/.i18n. Lag standardinnstillinger."
 
-#: ../src/view/home/HomeBox.py:80
-msgid "Confirm erase"
-msgstr "Bekreft sletting"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+#, fuzzy, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "Kunne ikke fastslå språket for koden=%s."
 
-#: ../src/view/home/HomeBox.py:82
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "Bekreft sletting: Ønsker du å slette %s for godt?"
+msgid "Sorry I do not speak '%s'."
+msgstr "Beklager, jeg snakker ikke '%s'."
 
-#: ../src/view/home/HomeBox.py:89
-#: ../src/view/palettes.py:120
-msgid "Erase"
-msgstr "Slett"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:215
-msgid "List view"
-msgstr "Listevisning"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:216
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:273
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Tilstanden er ukjent."
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Trådløs"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
 #, fuzzy
-msgid "Favorites view"
-msgstr "Favoritvisning"
+msgid "Radio"
+msgstr "Radio:"
 
-#: ../src/view/home/HomeBox.py:274
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:282
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Tjener:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Strøm"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "Feil i argument til automatisk strømstyring, bruk on/off."
+
+#: ../extensions/cpsection/power/model.py:120
 #, fuzzy
-msgid "Freeform"
-msgstr "Frihånd"
+msgid "Error in extreme pm argument, use on/off."
+msgstr "Feil i argument til ekstrem strømstyring, bruk on/off."
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:289
-msgid "Ring"
-msgstr "Ring"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "Strømstyring"
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Koble til"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "Automatisk strømstyring (øker batterilevetiden)"
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Koble fra"
+#: ../extensions/cpsection/power/view.py:86
+#, fuzzy
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr "Ekstrem strømstyring (slår av trådløs radio, øker batterilevetiden)"
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Kobler fra..."
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
-msgstr "Kobler til..."
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
-msgstr "Tilkoblet"
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:211
-#: ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
-msgid "Mesh Network"
-msgstr "Maskenettverk"
+msgid "None"
+msgstr "Ferdig"
 
-#: ../src/view/home/MeshBox.py:214
-#: ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
-msgstr "Koble fra..."
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:302
-#: ../src/view/palettes.py:61
-msgid "Resume"
-msgstr "Gjenoppta"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307
-#: ../src/view/frame/activitiestray.py:205
-msgid "Join"
-msgstr "Bli med"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Mitt Batteri"
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Fjern"
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Lader"
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 #, fuzzy
 msgid "Very little power remaining"
 msgstr "Veldig lite strøm igjen"
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 #, fuzzy, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d gjenstår"
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "Oppladet"
 
-#: ../src/view/devices/speaker.py:41
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Koble fra"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Kobler til..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Tilkoblet"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Koble til"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Avkoblet"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+#, fuzzy
+msgid "Mesh Network"
+msgstr "Maskenettverk"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+#, fuzzy
+msgid "Mesh Network %s"
+msgstr "Maskenettverk"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "Mine Høytalere"
 
-#: ../src/view/devices/speaker.py:116
+#: ../extensions/deviceicon/speaker.py:138
 #, fuzzy
 msgid "Unmute"
 msgstr "Ikke demp"
 
-#: ../src/view/devices/speaker.py:119
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
-msgstr "Avkoblet"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
-msgstr "Kanal"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "Nabolag"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+# Maskenett
+#: ../extensions/globalkey/screenshot.py:59
+#, fuzzy
+msgid "Mesh"
+msgstr "Maskenett"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Hjem"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Lek"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+#, fuzzy
+msgid "Screenshot"
+msgstr "Skjermbilde"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
@@ -252,18 +891,20 @@ msgstr ""
 "sugar-control-panel: ADVARSEL, fant mer enn en opsjon med samme navnet: %s "
 "modul: %r"
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "sugar-control-panel: key=%s er ikke en tilgjengelig opsjon."
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
 # Remember to fix indenting.
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 #, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
@@ -274,6 +915,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Bruk: sugar-control-panel [ opsjon ] nøkkel [ argumenter ... ] \n"
@@ -286,336 +928,874 @@ msgstr ""
 "    -s nøkkel       sett denne nøkkelen sin verdi \n"
 "    "
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "For å gjennomføre endringene må du starte sugar på nytt.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../src/controlpanel/toolbar.py:121
-msgid "Ok"
-msgstr ""
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Advarsel"
 
-#: ../src/controlpanel/sectionview.py:34
-#: ../src/controlpanel/gui.py:260
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Endringer krever omstart"
 
-#: ../src/controlpanel/gui.py:259
-msgid "Warning"
-msgstr "Advarsel"
-
-#: ../src/controlpanel/gui.py:263
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Avbryt endringer"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Senere"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Start om nå"
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
-msgstr "Du må skrive inn et navn."
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Ferdig"
 
-#: ../src/controlpanel/model/aboutme.py:67
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   %s"
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Bekreft sletting"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Bekreft sletting: Ønsker du å slette %s for godt?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Behold"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Slett"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Fjern favoritt"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+#, fuzzy
+msgid "Make favorite"
+msgstr "Lagre som favoritt"
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+#, fuzzy
+msgid "Freeform"
+msgstr "Frihånd"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "Ring"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     %s"
+msgid "%s"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Registrer"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "Listevisning"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
 #, fuzzy
-msgid "Error in specified color modifiers."
-msgstr "Feil i de angitte fargemodifikatorene."
+msgid "Favorites view"
+msgstr "Favoritvisning"
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
-msgstr "Feil i de angitte fargene."
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "Ikke tilgjengelig"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Nøkkelform:"
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "Feil: Tidssonen finnes ikke."
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Autentiseringsform:"
 
-#: ../src/controlpanel/model/frame.py:38
-#: ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
-msgstr "Verdien må være et heltall."
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Gjenoppta"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Bli med"
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
 #, fuzzy
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "Fikk ikke tilgang til ~/.i18n. Lag standardinnstillinger."
+msgid "Mesh Network %d"
+msgstr "Maskenettverk"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Avslå"
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-#, fuzzy, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "Kunne ikke fastslå språket for koden=%s."
+msgid "%dB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Beklager, jeg snakker ikke '%s'."
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "Du må angi en tjener."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "Tilstanden er ukjent."
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/controlpanel/model/power.py:57
-msgid "Error in automatic pm argument, use on/off."
-msgstr "Feil i argument til automatisk strømstyring, bruk on/off."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../src/controlpanel/model/power.py:86
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
-msgid "Error in extreme pm argument, use on/off."
-msgstr "Feil i argument til ekstrem strømstyring, bruk on/off."
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
-msgstr "Om meg"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Åpne"
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
-msgstr "Klikk for å endre din farge:"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Åpne med"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
-msgstr "Om min XO"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
-msgstr "Identitet"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Nabolag"
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
-msgstr "Serienummer:"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
-msgstr "Programvare"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
-msgstr "Bygg:"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-#, fuzzy
-msgid "Firmware:"
-msgstr "Fastvare:"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "Dato og tid"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Navn:"
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
-msgstr "Tidssone"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Klikk her for å endre farge"
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "Ramme"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Tilbake"
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
-msgstr "aldri"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Neste"
 
-#: ../src/controlpanel/view/frame.py:31
-#, fuzzy
-msgid "instantaneous"
-msgstr "umiddelbar"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%s seconds"
-msgstr "%s sekunder"
+msgid "Kind: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
-msgstr "Aktiveringsforsinkelse"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
-msgstr "Hjørne"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
-msgstr "Kant"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
-msgstr "Språk"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
-msgstr "Nettverk"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
-msgstr "Trådløs"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
-msgstr "Radio:"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
 
-# Maskenett
-#: ../src/controlpanel/view/network.py:94
-#, fuzzy
-msgid "Mesh"
-msgstr "Maskenett"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
-msgstr "Tjener:"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:27
-msgid "Power"
-msgstr "Strøm"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:51
-msgid "Power management"
-msgstr "Strømstyring"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:61
-msgid "Automatic power management (increases battery life)"
-msgstr "Automatisk strømstyring (øker batterilevetiden)"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:89
-#, fuzzy
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr "Ekstrem strømstyring (slår av trådløs radio, øker batterilevetiden)"
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-#, fuzzy
-msgid "Connected to a School Mesh Portal"
-msgstr "Koblet til en skolemaskenettportal"
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-#, fuzzy
-msgid "Looking for a School Mesh Portal..."
-msgstr "Leter etter en skolemaskenettportal"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-#, fuzzy
-msgid "Connected to an XO Mesh Portal"
-msgstr "Koblet til en XO maskenett portal"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-#, fuzzy
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Leter etter en XO maskenett portal..."
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-#, fuzzy
-msgid "Connected to a Simple Mesh"
-msgstr "Koblet til et enkelt maskenett"
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-#, fuzzy
-msgid "Starting a Simple Mesh"
-msgstr "Starter et enkelt maskenett"
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-#, fuzzy
-msgid "Unknown Mesh"
-msgstr "Ukjent maskenett"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:210
-msgid "Decline"
-msgstr "Avslå"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:285
-msgid "Registration Failed"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Start"
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:286
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "%s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:288
-msgid "Registration Successful"
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:289
-msgid "You are now registered with your school server."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:379
-msgid "Control Panel"
-msgstr "Kontrollpanel"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:390
-msgid "Restart"
-msgstr "Omstart"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB ledig"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:395
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Fjern venn"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Bli venn"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "Slå av"
 
-#: ../src/view/home/favoritesview.py:401
-msgid "Register"
-msgstr "Registrer"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Omstart"
 
-#: ../src/view/palettes.py:42
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Inviter til %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "Starter..."
 
-#: ../src/view/palettes.py:72
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Stans"
 
-#: ../src/view/palettes.py:104
-msgid "Start"
-msgstr "Start"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../src/view/palettes.py:132
-msgid "Remove favorite"
-msgstr "Fjern favoritt"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "Vis innhold"
 
-#: ../src/view/palettes.py:136
+#: ../src/jarabe/view/palettes.py:229
 #, fuzzy
-msgid "Make favorite"
-msgstr "Lagre som favoritt"
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../src/view/palettes.py:185
-msgid "Show contents"
-msgstr "Vis innhold"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
 
-#: ../src/view/palettes.py:209
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB ledig"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#, python-format
+#, fuzzy, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Utklipp: %s"
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Krypteringsform:"
+
+#~ msgid "Disconnecting..."
+#~ msgstr "Kobler fra..."
+
+#~ msgid "Disconnect..."
+#~ msgstr "Koble fra..."
+
+#~ msgid "You must enter a server."
+#~ msgstr "Du må angi en tjener."
+
+#~ msgid "About my XO"
+#~ msgstr "Om min XO"
+
+#, fuzzy
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Koblet til en skolemaskenettportal"
+
+#, fuzzy
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Leter etter en skolemaskenettportal"
+
+#, fuzzy
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Koblet til en XO maskenett portal"
+
+#, fuzzy
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Leter etter en XO maskenett portal..."
+
+#, fuzzy
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Koblet til et enkelt maskenett"
+
+#, fuzzy
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Starter et enkelt maskenett"
+
+#, fuzzy
+#~ msgid "Unknown Mesh"
+#~ msgstr "Ukjent maskenett"
+
+#~ msgid "Control Panel"
+#~ msgstr "Kontrollpanel"
diff --git a/po/pa.po b/po/pa.po
index a79e711..b0faf7d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/pap.po b/po/pap.po
index 2523f6e..1c9bda1 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-06-23 12:17-0400\n"
 "Last-Translator: Urso Wieske <uwieske@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,209 +15,860 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "Nomber:"
-
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
-msgstr "Klik pa kambia kolor:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../src/intro/intro.py:145
+#: ../extensions/cpsection/aboutme/model.py:48
 #, fuzzy
-msgid "Back"
-msgstr "Bek"
+msgid "You must enter a name."
+msgstr "Bo mester fill in un nomber."
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Kla"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "Sigiente"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-#, fuzzy
-msgid "Remove friend"
-msgstr "Kita amigu"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
 #, fuzzy
-msgid "Make friend"
-msgstr "Hasi amigu"
+msgid "Click to change your color:"
+msgstr "Klik pa kambia kolor:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "Invita pa %s"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "Elimina"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "Habri"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
-msgstr "Habri ku"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Clipboard obgeto: %s."
+msgid "%s seconds"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Tip di Tecla"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Tipo di Autentikashon"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Tipo di Enkriptashon:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
-msgstr "Kaptura di pantaya"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-#, fuzzy
-msgid "List view"
-msgstr "Bista di lista"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
-msgstr "<CTRL>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
-msgstr "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Konekta"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Diskonekta"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Deskonektando..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
-msgstr "Konektando..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
-msgstr "Konektá"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
-msgstr "Deskonekta..."
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
-msgstr "Resumí"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
-msgstr "Uni"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Kla"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Mi Bateria"
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Elimina"
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Kargando"
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "A sobra masha tiki power "
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "A sobra %(ora)d:%(min).2d "
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "Kargá"
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Diskonekta"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Konektando..."
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Konektá"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Konekta"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Deskonektá"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Kansela"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 #, fuzzy
 msgid "My Speakers"
 msgstr "Mi spikernan"
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Silensia"
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
-msgstr "Deskonektá"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
-msgstr "Kanal"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "Besindario"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Home"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Aktividad"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Kaptura di pantaya"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
@@ -226,17 +877,19 @@ msgstr ""
 "sugar-control-panel: KIDOU, a hanja mas ku un opshon ku e mesun nomber: %s "
 "modulo: %r"
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "sugar-control-panel: klave=%s no ta un opshon disponibel"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "sugar-control-panel: %s"
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 #, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
@@ -247,6 +900,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Uso: sugar-control-panel [opshon] klave [argumentonan ...] \n"
@@ -258,278 +912,845 @@ msgstr ""
 "       -g klave     hanja e bolr koriente di e klave aki\n"
 "       -s klave     sèt e bolor koriente di klave aki\n"
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Pa aplika bo kambionan bo tin ku restart sugar di nobo.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Kansela"
-
-#: ../src/controlpanel/toolbar.py:121
-msgid "Ok"
-msgstr "Ok"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Kidou"
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Kambionan ta eksigi restart"
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
-msgstr "Kidou"
-
-#: ../src/controlpanel/gui.py:253
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Kansela kambionan"
 
-#: ../src/controlpanel/gui.py:257
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Despues"
 
-#: ../src/controlpanel/gui.py:261
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Restart aworaki"
 
-#: ../src/controlpanel/model/aboutme.py:44
-#, fuzzy
-msgid "You must enter a name."
-msgstr "Bo mester fill in un nomber."
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Kla"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Ok"
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "stroke:   %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+#, fuzzy
+msgid "List view"
+msgstr "Bista di lista"
+
+#: ../src/jarabe/desktop/homebox.py:198
+#, fuzzy
+msgid "<Ctrl>2"
+msgstr "<CTRL>L"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+#, fuzzy
+msgid "<Ctrl>1"
+msgstr "<CTRL>L"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Tip di Tecla"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Tipo di Autentikashon"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Resumí"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Uni"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "fill:     %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-#, fuzzy
-msgid "You must enter a server."
-msgstr "Bo mester fill in un nomber."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
-msgid "Click to change your color:"
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Elimina"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Habri"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Habri ku"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Besindario"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Nomber:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr "Klik pa kambia kolor:"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+#, fuzzy
+msgid "Back"
+msgstr "Bek"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Sigiente"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+#, fuzzy
+msgid "Remove friend"
+msgstr "Kita amigu"
+
+#: ../src/jarabe/view/buddymenu.py:70
+#, fuzzy
+msgid "Make friend"
+msgstr "Hasi amigu"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Invita pa %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/view/palettes.py:71
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:169
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Elimina"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Clipboard obgeto: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Tipo di Enkriptashon:"
+
+#~ msgid "<Ctrl>R"
+#~ msgstr "<Ctrl>R"
+
+#~ msgid "Disconnecting..."
+#~ msgstr "Deskonektando..."
+
+#~ msgid "Disconnect..."
+#~ msgstr "Deskonekta..."
+
+#, fuzzy
+#~ msgid "You must enter a server."
+#~ msgstr "Bo mester fill in un nomber."
diff --git a/po/pis.po b/po/pis.po
index e184567..7fd0d5d 100644
--- a/po/pis.po
+++ b/po/pis.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,221 +16,874 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/intro.py:145
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -240,278 +893,821 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
-msgid "Changes require restart"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:253
-msgid "Cancel changes"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
-msgid "Later"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
-msgid "Restart now"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "stroke:   %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "fill:     %s"
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%s clipping"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/view/palettes.py:71
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:169
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/ps.po b/po/ps.po
index 1af6cf1..cd1dcde 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-01-09 11:20+0000\n"
 "Last-Translator: usman mansoor ansari <jalalkut@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,410 +15,1881 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "نوم:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
-msgstr "د رنګ بدلون لپاره ټك كړئ:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "شا"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "هوكې"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "بل"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "ملګرې لرکول"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "ملګرې جوړول"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "د بدلوونې رنګ په ټاكنه كۍ تېروتنه."
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "په مالومو رنګونو كې تېروتنې بدلوونې"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
+msgstr "د رنګ بدلون لپاره ټك كړئ:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "بلون %s ته"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
-msgstr "لركول"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "پرانېستل"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "ورځپاڼې ته زياتول"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "تېروتنه، مهالزون شتون نلري."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d ثانيې"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "%s ته لاسرسې نه كېږي. كره امستنې وپنځوئ"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "د ټوټه دړې څيزونه: %s."
+msgid "Language for code=%s could not be determined."
+msgstr "د code=%s لپاره ژبه مالومه نكړاى شوه."
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "كلي ځېل:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "بښنه غواړم زه خبرې نه كوم '%s'."
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "د كره توب ځېل:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "د کوډه کښنه ځېل:"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "پيلونه..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "کارمخینه"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "تمېدل"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
 
-#: ../shell/view/Shell.py:285
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "ايالت ناڅرګند دى."
+
+#: ../extensions/cpsection/network/model.py:99
 #, fuzzy
-msgid "Screenshot"
-msgstr "پرده انځور"
+msgid "Error in specified radio argument use on/off."
+msgstr "په ټاكلي راډيو كې تېروتنې "
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "بیاپیلون"
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "په ټاكلي راډيو كې تېروتنې "
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "ګلول-بندول"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "نومکښل"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "ناپيوستل"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
-msgstr "مېش جال"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "يوځايېنه"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "زما د بېټرۍ ژوند"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "بېټرۍ چارجېږي"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
-msgid "Battery discharging"
-msgstr "بېټري نه چارجېږي"
+msgid "None"
+msgstr "هوكې"
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "بېټري بشپړه چارج شوه"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
 #, fuzzy
-msgid "Disconnected"
+msgid "Removed"
+msgstr "لركول"
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+#, fuzzy
+msgid "Disconnect"
 msgstr "ناپيوستل"
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "چېنل"
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "ګاونډېتوب"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+#, fuzzy
+msgid "Disconnected"
+msgstr "ناپيوستل"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "رنګول"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "مېش جال"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "مېش جال"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "ډله"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "کور"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "چارندتیا"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "ونډول له:"
+#: ../extensions/globalkey/screenshot.py:72
+#, fuzzy
+msgid "Screenshot"
+msgstr "پرده انځور"
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "ځاني"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "زما ګاونډيتوب"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "خوندي كول"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "ناکړ"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "بیاکړ"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "لمېسل"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "سرېښل"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
-msgstr "%s چارندتیا"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "تېروتنې ساتل"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "تېروتنې ساتل: ټول بدلونونه به له لاسه وركړئ"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "مه تمېږه"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "پ هره توګه تمېدل"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "د بدلونونو كارولو لپاره تاسې بايد شوګر بیاپیل كړئ.\n"
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "رنګول"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "هوكې"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "هو"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "ادامه وركول"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "هو"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d كال"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "خوندي كول"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "نومکښل"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "كلي ځېل:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "د كره توب ځېل:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "کارمخینه"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "يوځايېنه"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
-msgstr "%d كلونه"
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "مېش جال"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d month"
-msgstr "%d مياشت"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d months"
-msgstr "%d مياشتې"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d week"
-msgstr "%d اونۍ"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d weeks"
-msgstr "%d اونۍ"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d day"
-msgstr "%d ورځ"
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d days"
-msgstr "%d ورځې"
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hour"
-msgstr "%d ساعت"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "لركول"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "پرانېستل"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d hours"
-msgstr "%d ساعتونه"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "ګاونډېتوب"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "نوم:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "د رنګ بدلون لپاره ټك كړئ:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "شا"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "بل"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minute"
-msgstr "%d دقيقه"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d minutes"
-msgstr "%d دقيقې"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d second"
-msgstr "%d ثانيه"
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%d seconds"
-msgstr "%d ثانيې"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr "_او_"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr "،_"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "د بدلونونو كارولو لپاره تاسې بايد شوګر بیاپیل كړئ.\n"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "د بدلوونې رنګ په ټاكنه كۍ تېروتنه."
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "په مالومو رنګونو كې تېروتنې بدلوونې"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "بندول"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "روښانول"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "ايالت ناڅرګند دى."
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-#, fuzzy
-msgid "Error in specified radio argument use on/off."
-msgstr "په ټاكلي راډيو كې تېروتنې "
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-#, fuzzy
-msgid "Permission denied. You need to be root to run this method."
-msgstr "پرېښلې رد شو. ددې لېلې چلولو لپاره بايد تاسې  ريښه اوسـئ"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "د مهالزون په لوستتنه كې تېروتنې"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "تېروتنه مهالزون لمېسل (له %s):  %s"
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "مهالزون پرېښلې د بدلون په حال كې: %s"
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "تېروتنه، مهالزون شتون نلري."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "%s ته لاسرسې نه كېږي. كره امستنې وپنځوئ"
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "ملګرې لرکول"
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "ملګرې جوړول"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "ګلول-بندول"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "د code=%s لپاره ژبه مالومه نكړاى شوه."
+msgid "Invite to %s"
+msgstr "بلون %s ته"
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "بښنه غواړم زه خبرې نه كوم '%s'."
+msgid "<b>%s</b> failed to start."
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "د ښوونځي مېش ور سره پيوست شو."
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "پيلونه..."
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "د ښوونځي مېش ور لپاره لټون"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "د  XO مېش ور سره پيوست شو."
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "د XO مېش ور لپاره لټون"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "تمېدل"
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "له ساده مېش سره پيوست شو."
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "د ساده مېش پيلېدنه"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "ناڅرګنده مېش"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "لركول"
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
 msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "ورځپاڼې ته زياتول"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "د ټوټه دړې څيزونه: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "د کوډه کښنه ځېل:"
+
+#~ msgid "Reboot"
+#~ msgstr "بیاپیلون"
+
+#~ msgid "Disconnect..."
+#~ msgstr "ناپيوستل"
+
+#~ msgid "My Battery life"
+#~ msgstr "زما د بېټرۍ ژوند"
+
+#~ msgid "Battery charging"
+#~ msgstr "بېټرۍ چارجېږي"
+
+#, fuzzy
+#~ msgid "Battery discharging"
+#~ msgstr "بېټري نه چارجېږي"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "بېټري بشپړه چارج شوه"
+
+#~ msgid "Share with:"
+#~ msgstr "ونډول له:"
+
+#~ msgid "Private"
+#~ msgstr "ځاني"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "زما ګاونډيتوب"
+
+#~ msgid "Undo"
+#~ msgstr "ناکړ"
+
+#~ msgid "Redo"
+#~ msgstr "بیاکړ"
+
+#~ msgid "Copy"
+#~ msgstr "لمېسل"
+
+#~ msgid "Paste"
+#~ msgstr "سرېښل"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s چارندتیا"
+
+#~ msgid "Keep error"
+#~ msgstr "تېروتنې ساتل"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "تېروتنې ساتل: ټول بدلونونه به له لاسه وركړئ"
+
+#~ msgid "Don't stop"
+#~ msgstr "مه تمېږه"
+
+#~ msgid "Stop anyway"
+#~ msgstr "پ هره توګه تمېدل"
+
+#~ msgid "Continue"
+#~ msgstr "ادامه وركول"
+
+#~ msgid "OK"
+#~ msgstr "هو"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d كال"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d كلونه"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d مياشت"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d مياشتې"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d اونۍ"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d اونۍ"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d ورځ"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d ورځې"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d ساعت"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d ساعتونه"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d دقيقه"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d دقيقې"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d ثانيه"
+
+#~ msgid " and "
+#~ msgstr "_او_"
+
+#~ msgid ", "
+#~ msgstr "،_"
+
+#~ msgid "off"
+#~ msgstr "بندول"
+
+#~ msgid "on"
+#~ msgstr "روښانول"
+
+#, fuzzy
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "پرېښلې رد شو. ددې لېلې چلولو لپاره بايد تاسې  ريښه اوسـئ"
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "د مهالزون په لوستتنه كې تېروتنې"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "تېروتنه مهالزون لمېسل (له %s):  %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "مهالزون پرېښلې د بدلون په حال كې: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "د ښوونځي مېش ور سره پيوست شو."
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "د ښوونځي مېش ور لپاره لټون"
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "د  XO مېش ور سره پيوست شو."
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "د XO مېش ور لپاره لټون"
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "له ساده مېش سره پيوست شو."
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "د ساده مېش پيلېدنه"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "ناڅرګنده مېش"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 30e7cff..2b7c63e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: olpc-sugar-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-09-28 19:42+0200\n"
+"PO-Revision-Date: 2011-10-15 14:10+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-docs-br@redhat.com>\n"
 "Language: pt_BR\n"
@@ -478,8 +478,9 @@ msgid "Connected"
 msgstr "Conectado"
 
 #: ../extensions/deviceicon/network.py:130
+#, fuzzy
 msgid "No wireless connection"
-msgstr ""
+msgstr "Nenhuma conexão sem fio"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -522,18 +523,19 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../extensions/deviceicon/network.py:333
+#, fuzzy
 msgid "Try connection again"
-msgstr ""
+msgstr "Tentar conexão novamente"
 
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Erro: %s"
 
 #: ../extensions/deviceicon/network.py:340
-#, python-format
+#, python-format, fuzzy
 msgid "Suggestion: %s"
-msgstr ""
+msgstr "Sugestão: %s"
 
 #: ../extensions/deviceicon/network.py:349
 #, python-format
@@ -708,28 +710,33 @@ msgid "Font size that is used throughout the desktop."
 msgstr "Tamanho da fonte que é utilizada por toda área de trabalho."
 
 #: ../data/sugar.schemas.in.h:18
+#, fuzzy
 msgid "GSM network APN"
-msgstr ""
+msgstr "APN da rede GSM"
 
 #: ../data/sugar.schemas.in.h:19
+#, fuzzy
 msgid "GSM network PIN"
-msgstr ""
+msgstr "PIN da rede GSM"
 
 #: ../data/sugar.schemas.in.h:20
+#, fuzzy
 msgid "GSM network PUK"
-msgstr ""
+msgstr "PUK da rede GSM"
 
 #: ../data/sugar.schemas.in.h:21
 msgid "GSM network access point name configuration"
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:22
+#, fuzzy
 msgid "GSM network number"
-msgstr ""
+msgstr "Número da rede GSM"
 
 #: ../data/sugar.schemas.in.h:23
+#, fuzzy
 msgid "GSM network password"
-msgstr ""
+msgstr "Senha da rede GSM"
 
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
@@ -748,8 +755,9 @@ msgid "GSM network telephone number configuration"
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:28
+#, fuzzy
 msgid "GSM network username"
-msgstr ""
+msgstr "Nome de usuário da rede GSM"
 
 #: ../data/sugar.schemas.in.h:29
 msgid "GSM network username configuration"
@@ -1063,8 +1071,9 @@ msgstr "Cadastrar"
 
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
+#, fuzzy
 msgid "Register again"
-msgstr ""
+msgstr "Registrar novamente"
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
@@ -1199,7 +1208,6 @@ msgid "Transfer to %s"
 msgstr ""
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
-#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Remover"
@@ -1363,12 +1371,12 @@ msgstr "Qualquer coisa"
 #: ../src/jarabe/journal/journaltoolbox.py:381
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
-msgstr ""
+msgstr "Copiar para"
 
 #: ../src/jarabe/journal/journaltoolbox.py:389
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicar"
 
 #: ../src/jarabe/journal/journaltoolbox.py:422
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
@@ -1381,7 +1389,7 @@ msgstr ""
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
@@ -1506,7 +1514,7 @@ msgstr "Nenhuma atividade para continuar a entrada"
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #: ../src/jarabe/journal/volumestoolbar.py:391
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
@@ -1711,9 +1719,9 @@ msgid "Invite to %s"
 msgstr "Convidar para %s"
 
 #: ../src/jarabe/view/launcher.py:145
-#, python-format
+#, python-format, fuzzy
 msgid "<b>%s</b> failed to start."
-msgstr ""
+msgstr "<b>%s</b> falha ao iniciar."
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
@@ -1741,7 +1749,6 @@ msgid "Show contents"
 msgstr "Mostar conteúdos"
 
 #: ../src/jarabe/view/palettes.py:229
-#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
 msgstr "Remover"
diff --git a/po/qqa.po b/po/qqa.po
new file mode 100644
index 0000000..b42ad7e
--- /dev/null
+++ b/po/qqa.po
@@ -0,0 +1,2140 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#  "Acerca de mí"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
+
+#  "Debe ingresar un nombre."
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#  "borde:   color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#  "borde:   %s"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#  "relleno:     color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#  "relleno:     %s"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#  "Error en modificadores de color especificados."
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#  "Error en colores especificados."
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#  "Clic para cambiar su color:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#  "Acerca de mi computadora"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#  "No disponible"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#  "%(interface)s: %(version)s"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#  "Identidad"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#  "Número de serie:"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#  "Software"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#  "Ensamble:"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#  "Azúcar:"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#  "Firmware:"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#  "Firmware de la red inalámbrica:"
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#  "Licencia y derechos de autor"
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+
+#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
+#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
+#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
+#  "se describen en ella."
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#  "Licencia completa:"
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#  "Fecha y hora"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#  "Error, zona horaria no existe."
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#  "Zona horaria"
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#  "Cuadro"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#  "El valor debe ser un número entero."
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#  "nunca"
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#  "instantáneo"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#  "%s segundos"
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#  "Retraso de activación"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#  "Esquina"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#  "Borde"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#  "Teclado"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#  "Modelo de teclado"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#  "Tecla(s) para cambiar el diseño"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#  "Diseño(s) de teclado"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#  "Idioma"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+
+#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#  "El lenguaje del código=%s no pudo ser determinado."
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#  "Lo siento, yo no hablo '%s'."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+
+#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+#  "disponible, se usará la siguiente en la lista."
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#  "Configuración del módem"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#  "Nombre de usuario:"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#  "Contraseña:"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#  "Número:"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#  "Nombre de punto de acceso (APN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#  "Número de identificación personal (PIN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#  "Clave personal de desbloqueo (PUK):"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+
+#  "Necesitará proveer la información siguiente para configurar una conexión de "
+#  "banda ancha (3G) de red de telefonía celular."
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#  "Red"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#  "Estado desconocido."
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#  "Error en argumento especificado de radio use on/off."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#  "Error en argumento especificado use 0/1."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#  "Inalámbrica"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#  "Apague la radio inalámbrica y ahorre vida de batería"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#  "Radio"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#  "Descarte el historial de la red si tiene problemas de conexión"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#  "Descarte historial de la red"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#  "Colaboración"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+
+#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
+#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#  "Servidor:"
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#  "Energía"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#  "Error en argumento automático de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#  "Error en argumento extremo de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#  "Manejo de energía"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#  "Manejo automático de energía (incrementa la vida de la batería)"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+
+#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
+#  "duración de la batería)"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#  "Actualización de software"
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+
+#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+#  "de seguridad y proveen nuevas características."
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#  "Probando %s..."
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#  "Descargando %s..."
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#  "Actualizando %s..."
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#  "Tu software esta actualizado"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#  "Puedes instalar %s actualización"
+#  "Puedes instalar %s actualizaciones"
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Buscando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#  "Instalando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#  "%s actualización fue instalada"
+#  "%s actualizaciones fueron instaladas"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Instalación seleccionada"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#  "Tamaño de descarga: %s"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#  "Ninguno"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#  "1 KB"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#  "%.0f KB"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#  "%.1f MB"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#  "Mi batería"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#  "Eliminado"
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#  "Cargando"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#  "Queda muy poca batería"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#  "Quedan %(hour)d:%(min).2d"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#  "Cargada"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#  "Direccion IP: %s"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#  "Desconectar"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#  "Conectando..."
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#  "Conectado"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#  "No hay conexión inalámbrica"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#  "Canal"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#  "Red Cableada"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#  "Velocidad"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#  "Módem inalámbrico"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#  "Espere por favor..."
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#  "Conectar"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#  "Desconectado"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#  "Cancelar"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#  "Probar la conexión nuevamente"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#  "Error: %s"
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#  "Sugerencia: %s"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#  "Conectado a %s"
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#  "%d KB"
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#  "Revise la configuración de su Pin/Puk."
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#  "Revise la configuración del nombre de su punto de acceso (APN)"
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#  "Revise el Número en la configuración."
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#  "Revise su configuración."
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#  "Red Malla"
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#  "Red Malla %s"
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#  "No se dispone de conexión GSM."
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#  "Crear una conexión en el panel de control."
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#  "Mis parlantes"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#  "Dar voz"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#  "Silenciar"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#  "dedo"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#  "estilo"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#  "Mi superficie táctil"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#  "Malla"
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#  "Grupo"
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#  "Hogar"
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#  "Actividad"
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#  "Captura de pantalla"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#  "Captura pantalla de \"%s\""
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+
+#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
+#  "para reutilizar el nombre largo de la cuenta UNIX."
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#  "Directorios adicionales que pueden contener traducciones actualizadas."
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#  "URL de Respaldo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#  "Bundle IDs de actividades protegidas"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+
+#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
+#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
+#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#  "Retraso de las Esquinas"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#  "Tipo de letra predeterminado"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#  "Tamaño de letra predeterminado"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#  "Apodo predeterminado"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando las esquinas."
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando los bordes."
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#  "Directorio a buscar para traducciones"
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#  "Retraso del Borde"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#  "Diseño de favoritos"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#  "Modo de reanudar favoritos"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#  "Tipo de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#  "Tamaño de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#  "APN de la red GSM"
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#  "PIN de la red GSM"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#  "PUK de la red GSM"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#  "Número de la red GSM"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#  "Contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#  "Configuración de la contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#  "Configuración del numero de identificación personal (PIN) de la red GSM"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#  "Configuración del número de teléfono de la red GSM"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#  "Nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#  "Configuración del nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+
+#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
+#  "Jabber."
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+
+#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
+#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
+#  "automáticamente a una red ad-hoc."
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#  "Servidor Jabber"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#  "Distribuciones del teclado"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#  "Modelo del teclado"
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#  "Opciones del teclado"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#  "Distribución de las actividades favoritas."
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+
+#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
+#  "distribución(variante)"
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#  "Lista de las opciones del teclado."
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#  "Manejo automática de energía"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#  "Manejo automática de energía."
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#  "Manejo extremo de energía"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#  "Manejo extremo de energía."
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#  "Publicar en Gadget"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#  "Configuración para silenciar el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#  "Mostrar Terminar Sesión"
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#  "Mostrar Reiniciar"
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#  "Mostrar redes específicas de Azúcar"
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#  "Sonido silenciado"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#  "El modelo del teclado que se utilizará"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#  "Configuración de zona horaria para el sistema."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#  "URL del servidor de Jabber para usar."
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#  "URL donde se guarda el backup."
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#  "Color del usuario"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#  "Nombre de usuario"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#  "Nombre de usuario que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+
+#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
+#  "lista."
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#  "Nivel de volumen"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#  "Nivel de volumen para el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+
+#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
+#  "que se retome la última entrada de esa actividad."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+
+#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
+#  "módulo %s: %r"
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#  "sugar-control-panel: clave=%s no es una opción disponible"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#  "sugar-control-panel: %s"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+
+#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
+#  "    Control para el ambiente de sugar. \n"
+#  "    Opciones: \n"
+#  "    -h               muestra este mensaje de ayuda y sale \n"
+#  "    -l                enumera todas las opciones disponibles \n"
+#  "    -h clave       muestra la información sobre esta clave \n"
+#  "    -g clave       obtiene el valor actual de la clave \n"
+#  "    -s clave       establece el valor actual de la clave \n"
+#  "    -c clave  vaciar el valor actual de la clave \n"
+#  "    "
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#  "Advertencia"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#  "Los cambios requieren reiniciar"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#  "Cancelar cambios"
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#  "Después"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#  "Reiniciar ahora"
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#  "Hecho"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#  "Versión %s"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#  "Confirmar borrado"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#  "Guardar"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#  "Borrar"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#  "Remover favorito"
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#  "Hacer favorito"
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#  "Forma libre"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#  "Anillo"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#  "Espiral"
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#  "Caja"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#  "Triángulo"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#  "Error al registrar"
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#  "%s"
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#  "Registro exitoso"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#  "Ahora estás registrado en el servidor de colegio."
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#  "Registro"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#  "Registrar nuevamente"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#  "Actualización de Software"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+
+#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#  "Pruebe ahora"
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#  "Vista en lista"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#  "<Ctrl>2"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#  "Vista de favoritos"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#  "<Ctrl>1"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#  "Tipo de clave:"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#  "Tipo de autenticación:"
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#  "WPA y WPA2 Personal"
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#  "Seguridad inalámbrica:"
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#  "Retomar"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#  "Unirse"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#  "Red específica %d"
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#  "Red Malla %d"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#  "No se puede conectar al servidor."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#  "El servidor no pudo completar el pedido."
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#  "Rechazar"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#  "%dB"
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#  "%dKB"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#  "%dMB"
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#  "%s de %s"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#  "Transferencia desde %s"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#  "%s (%s)"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#  "Descartar"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#  "El otro participante canceló la transferencia del archivo"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#  "Transferir a %s"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgid "Remove"
+msgstr ""
+
+#  "Abrir"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#  "Abrir con"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#  "recorte de %s"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#  "Vecindario"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#  "F1"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#  "F2"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#  "F3"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#  "F4"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#  "Nombre:"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#  "Clic para cambiar de color:"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#  "Atrás"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#  "Siguiente"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#  "Sin título"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#  "Sin vista previa"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#  "Tipo: %s"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#  "Desconocido"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#  "Fecha: %s"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#  "Tamaño: %s"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#  "Sin fecha"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#  "Participantes:"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#  "Descripción:"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#  "Etiquetas:"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#  "Diario"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#  "Buscar"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#  "Cualquier momento"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#  "Hoy"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#  "Desde ayer"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#  "Última semana"
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#  "Último mes"
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#  "Último año"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#  "Mis amigos"
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#  "Mi clase"
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#  "Copiar a"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#  "Duplicar"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#  "Error mientras se copiaba la entrada. %s"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#  "Error"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#  "Iniciar"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#  "Ordenar por fecha de modificación"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#  "Ordenar por fecha de creación"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#  "Ordenar por tamaño"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#  "Ordenar vista"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#  "Su diario está vacío"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#  "Tu carpeta de documentos está vacía"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#  "El dispositivo está vacío"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#  "No hay entradas coincidentes"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#  "Limpiar búsqueda"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#  "Versión más antigua de la actividad %s"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#  "¿Desea instalar la versión %s, mas antigua?    "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#  "Su diario está lleno"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+
+#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
+#  "nuevas entradas."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#  "Mostrar diario"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#  "Escoja un objeto"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#  "Cerrar"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#  "Reiniciar con"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#  "Empezar con"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#  "No se encontró una actividad para iniciar la entrada"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#  "Enviar a"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#  "Ver detalles"
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#  "Las entradas sin un archivo no pueden ser enviadas."
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#  "Entradas sin un archivo no pueden ser copiadas."
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#  "Portapapeles"
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#  "No hay amigos presentes"
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#  "No se encontró una conexión válida"
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#  "No se encontró una actividad para retomar la entrada"
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#  "Documentos"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#  "%(free_space)d MB libres"
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#  "La razón para el cambio de estado del dispositivo es desconocida."
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#  "El cambio de estado es normal."
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#  "El dispositivo está siendo administrado."
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#  "El dispositivo ya no está siendo administrado."
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#  "El dispositivo no pudo ser preparado para su configuración."
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+
+#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
+#  "tiempo fuera, etc)."
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#  "La configuración IP ya no es válida."
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#  "Claves requeridas, pero no fueron suministradas."
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+
+#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
+#  "autenticación."
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#  "Configuración del cliente 802.1X fallada."
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio PPP se ha desconectado inesperadamente."
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#  "El servicio PPP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio DHCP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio DHCP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio de conexión compartida ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+
+#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio AutoIP ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#  "El servicio AutoIP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#  "Conexión fallada porque la línea estaba ocupada."
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#  "Conexión fallada porque no había tono de llamada."
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#  "Conexión fallada porque no había portadora."
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#  "Llamada expiró por tiempo."
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#  "Llamada falló."
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#  "Fallo en inicialización de modem."
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#  "Fallo al seleccionar el punto de acceso (APN) GSM"
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#  "No se buscan redes."
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#  "Registración en la red fué rechazada."
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#  "Registración en la red expiró."
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#  "Falló la registración con la red GSM solicitada."
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#  "Control de PIN fallado."
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#  "Firmware necesario para el dispositivo puede faltar."
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#  "El dispositivo fué quitado."
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#  "NetworkManager fue dormido."
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+
+#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#  "Un usuario o cliente solicitó la desconexión."
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#  "La portadora/link del dispositivo a cambiado."
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#  "Remover amigo"
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#  "Agregar amigo"
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#  "Apagar"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#  "Reiniciar"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#  "Salir"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#  "Mis ajustes"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#  "Invitar a %s"
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#  "<b>%s</b> falló al iniciar."
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#  "Iniciando..."
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#  "Actividad falló al iniciar"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#  "Ver fuente"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#  "Parar"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#  "Empezar nuevo"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#  "Mostrar contenidos"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/view/palettes.py:229
+msgid "Remove"
+msgstr ""
+
+#  "Fuente de la instancia"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#  "Fuente"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#  "Fuente del paquete de la actividad"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#  "Fuente del paquete SugarToolkit"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#  "Ver código fuente: %r"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#  "Sugar en una ventana"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
diff --git a/po/qu.po b/po/qu.po
index a79e711..b0faf7d 100644
--- a/po/qu.po
+++ b/po/qu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/quy.po b/po/quy.po
new file mode 100644
index 0000000..b42ad7e
--- /dev/null
+++ b/po/quy.po
@@ -0,0 +1,2140 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#  "Acerca de mí"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
+
+#  "Debe ingresar un nombre."
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#  "borde:   color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#  "borde:   %s"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#  "relleno:     color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#  "relleno:     %s"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#  "Error en modificadores de color especificados."
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#  "Error en colores especificados."
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#  "Clic para cambiar su color:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#  "Acerca de mi computadora"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#  "No disponible"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#  "%(interface)s: %(version)s"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#  "Identidad"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#  "Número de serie:"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#  "Software"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#  "Ensamble:"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#  "Azúcar:"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#  "Firmware:"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#  "Firmware de la red inalámbrica:"
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#  "Licencia y derechos de autor"
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+
+#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
+#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
+#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
+#  "se describen en ella."
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#  "Licencia completa:"
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#  "Fecha y hora"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#  "Error, zona horaria no existe."
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#  "Zona horaria"
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#  "Cuadro"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#  "El valor debe ser un número entero."
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#  "nunca"
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#  "instantáneo"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#  "%s segundos"
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#  "Retraso de activación"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#  "Esquina"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#  "Borde"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#  "Teclado"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#  "Modelo de teclado"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#  "Tecla(s) para cambiar el diseño"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#  "Diseño(s) de teclado"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#  "Idioma"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+
+#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#  "El lenguaje del código=%s no pudo ser determinado."
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#  "Lo siento, yo no hablo '%s'."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+
+#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+#  "disponible, se usará la siguiente en la lista."
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#  "Configuración del módem"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#  "Nombre de usuario:"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#  "Contraseña:"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#  "Número:"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#  "Nombre de punto de acceso (APN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#  "Número de identificación personal (PIN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#  "Clave personal de desbloqueo (PUK):"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+
+#  "Necesitará proveer la información siguiente para configurar una conexión de "
+#  "banda ancha (3G) de red de telefonía celular."
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#  "Red"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#  "Estado desconocido."
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#  "Error en argumento especificado de radio use on/off."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#  "Error en argumento especificado use 0/1."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#  "Inalámbrica"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#  "Apague la radio inalámbrica y ahorre vida de batería"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#  "Radio"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#  "Descarte el historial de la red si tiene problemas de conexión"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#  "Descarte historial de la red"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#  "Colaboración"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+
+#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
+#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#  "Servidor:"
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#  "Energía"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#  "Error en argumento automático de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#  "Error en argumento extremo de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#  "Manejo de energía"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#  "Manejo automático de energía (incrementa la vida de la batería)"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+
+#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
+#  "duración de la batería)"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#  "Actualización de software"
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+
+#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+#  "de seguridad y proveen nuevas características."
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#  "Probando %s..."
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#  "Descargando %s..."
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#  "Actualizando %s..."
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#  "Tu software esta actualizado"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#  "Puedes instalar %s actualización"
+#  "Puedes instalar %s actualizaciones"
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Buscando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#  "Instalando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#  "%s actualización fue instalada"
+#  "%s actualizaciones fueron instaladas"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Instalación seleccionada"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#  "Tamaño de descarga: %s"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#  "Ninguno"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#  "1 KB"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#  "%.0f KB"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#  "%.1f MB"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#  "Mi batería"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#  "Eliminado"
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#  "Cargando"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#  "Queda muy poca batería"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#  "Quedan %(hour)d:%(min).2d"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#  "Cargada"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#  "Direccion IP: %s"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#  "Desconectar"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#  "Conectando..."
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#  "Conectado"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#  "No hay conexión inalámbrica"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#  "Canal"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#  "Red Cableada"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#  "Velocidad"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#  "Módem inalámbrico"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#  "Espere por favor..."
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#  "Conectar"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#  "Desconectado"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#  "Cancelar"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#  "Probar la conexión nuevamente"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#  "Error: %s"
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#  "Sugerencia: %s"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#  "Conectado a %s"
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#  "%d KB"
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#  "Revise la configuración de su Pin/Puk."
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#  "Revise la configuración del nombre de su punto de acceso (APN)"
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#  "Revise el Número en la configuración."
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#  "Revise su configuración."
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#  "Red Malla"
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#  "Red Malla %s"
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#  "No se dispone de conexión GSM."
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#  "Crear una conexión en el panel de control."
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#  "Mis parlantes"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#  "Dar voz"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#  "Silenciar"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#  "dedo"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#  "estilo"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#  "Mi superficie táctil"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#  "Malla"
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#  "Grupo"
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#  "Hogar"
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#  "Actividad"
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#  "Captura de pantalla"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#  "Captura pantalla de \"%s\""
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+
+#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
+#  "para reutilizar el nombre largo de la cuenta UNIX."
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#  "Directorios adicionales que pueden contener traducciones actualizadas."
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#  "URL de Respaldo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#  "Bundle IDs de actividades protegidas"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+
+#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
+#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
+#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#  "Retraso de las Esquinas"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#  "Tipo de letra predeterminado"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#  "Tamaño de letra predeterminado"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#  "Apodo predeterminado"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando las esquinas."
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando los bordes."
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#  "Directorio a buscar para traducciones"
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#  "Retraso del Borde"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#  "Diseño de favoritos"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#  "Modo de reanudar favoritos"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#  "Tipo de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#  "Tamaño de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#  "APN de la red GSM"
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#  "PIN de la red GSM"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#  "PUK de la red GSM"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#  "Número de la red GSM"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#  "Contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#  "Configuración de la contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#  "Configuración del numero de identificación personal (PIN) de la red GSM"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#  "Configuración del número de teléfono de la red GSM"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#  "Nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#  "Configuración del nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+
+#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
+#  "Jabber."
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+
+#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
+#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
+#  "automáticamente a una red ad-hoc."
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#  "Servidor Jabber"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#  "Distribuciones del teclado"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#  "Modelo del teclado"
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#  "Opciones del teclado"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#  "Distribución de las actividades favoritas."
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+
+#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
+#  "distribución(variante)"
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#  "Lista de las opciones del teclado."
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#  "Manejo automática de energía"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#  "Manejo automática de energía."
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#  "Manejo extremo de energía"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#  "Manejo extremo de energía."
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#  "Publicar en Gadget"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#  "Configuración para silenciar el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#  "Mostrar Terminar Sesión"
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#  "Mostrar Reiniciar"
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#  "Mostrar redes específicas de Azúcar"
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#  "Sonido silenciado"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#  "El modelo del teclado que se utilizará"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#  "Configuración de zona horaria para el sistema."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#  "URL del servidor de Jabber para usar."
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#  "URL donde se guarda el backup."
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#  "Color del usuario"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#  "Nombre de usuario"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#  "Nombre de usuario que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+
+#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
+#  "lista."
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#  "Nivel de volumen"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#  "Nivel de volumen para el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+
+#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
+#  "que se retome la última entrada de esa actividad."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+
+#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
+#  "módulo %s: %r"
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#  "sugar-control-panel: clave=%s no es una opción disponible"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#  "sugar-control-panel: %s"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+
+#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
+#  "    Control para el ambiente de sugar. \n"
+#  "    Opciones: \n"
+#  "    -h               muestra este mensaje de ayuda y sale \n"
+#  "    -l                enumera todas las opciones disponibles \n"
+#  "    -h clave       muestra la información sobre esta clave \n"
+#  "    -g clave       obtiene el valor actual de la clave \n"
+#  "    -s clave       establece el valor actual de la clave \n"
+#  "    -c clave  vaciar el valor actual de la clave \n"
+#  "    "
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#  "Advertencia"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#  "Los cambios requieren reiniciar"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#  "Cancelar cambios"
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#  "Después"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#  "Reiniciar ahora"
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#  "Hecho"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#  "Versión %s"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#  "Confirmar borrado"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#  "Guardar"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#  "Borrar"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#  "Remover favorito"
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#  "Hacer favorito"
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#  "Forma libre"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#  "Anillo"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#  "Espiral"
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#  "Caja"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#  "Triángulo"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#  "Error al registrar"
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#  "%s"
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#  "Registro exitoso"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#  "Ahora estás registrado en el servidor de colegio."
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#  "Registro"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#  "Registrar nuevamente"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#  "Actualización de Software"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+
+#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#  "Pruebe ahora"
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#  "Vista en lista"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#  "<Ctrl>2"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#  "Vista de favoritos"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#  "<Ctrl>1"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#  "Tipo de clave:"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#  "Tipo de autenticación:"
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#  "WPA y WPA2 Personal"
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#  "Seguridad inalámbrica:"
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#  "Retomar"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#  "Unirse"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#  "Red específica %d"
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#  "Red Malla %d"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#  "No se puede conectar al servidor."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#  "El servidor no pudo completar el pedido."
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#  "Rechazar"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#  "%dB"
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#  "%dKB"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#  "%dMB"
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#  "%s de %s"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#  "Transferencia desde %s"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#  "%s (%s)"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#  "Descartar"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#  "El otro participante canceló la transferencia del archivo"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#  "Transferir a %s"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgid "Remove"
+msgstr ""
+
+#  "Abrir"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#  "Abrir con"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#  "recorte de %s"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#  "Vecindario"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#  "F1"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#  "F2"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#  "F3"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#  "F4"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#  "Nombre:"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#  "Clic para cambiar de color:"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#  "Atrás"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#  "Siguiente"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#  "Sin título"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#  "Sin vista previa"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#  "Tipo: %s"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#  "Desconocido"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#  "Fecha: %s"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#  "Tamaño: %s"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#  "Sin fecha"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#  "Participantes:"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#  "Descripción:"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#  "Etiquetas:"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#  "Diario"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#  "Buscar"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#  "Cualquier momento"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#  "Hoy"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#  "Desde ayer"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#  "Última semana"
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#  "Último mes"
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#  "Último año"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#  "Mis amigos"
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#  "Mi clase"
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#  "Copiar a"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#  "Duplicar"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#  "Error mientras se copiaba la entrada. %s"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#  "Error"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#  "Iniciar"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#  "Ordenar por fecha de modificación"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#  "Ordenar por fecha de creación"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#  "Ordenar por tamaño"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#  "Ordenar vista"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#  "Su diario está vacío"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#  "Tu carpeta de documentos está vacía"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#  "El dispositivo está vacío"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#  "No hay entradas coincidentes"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#  "Limpiar búsqueda"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#  "Versión más antigua de la actividad %s"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#  "¿Desea instalar la versión %s, mas antigua?    "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#  "Su diario está lleno"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+
+#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
+#  "nuevas entradas."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#  "Mostrar diario"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#  "Escoja un objeto"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#  "Cerrar"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#  "Reiniciar con"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#  "Empezar con"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#  "No se encontró una actividad para iniciar la entrada"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#  "Enviar a"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#  "Ver detalles"
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#  "Las entradas sin un archivo no pueden ser enviadas."
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#  "Entradas sin un archivo no pueden ser copiadas."
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#  "Portapapeles"
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#  "No hay amigos presentes"
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#  "No se encontró una conexión válida"
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#  "No se encontró una actividad para retomar la entrada"
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#  "Documentos"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#  "%(free_space)d MB libres"
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#  "La razón para el cambio de estado del dispositivo es desconocida."
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#  "El cambio de estado es normal."
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#  "El dispositivo está siendo administrado."
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#  "El dispositivo ya no está siendo administrado."
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#  "El dispositivo no pudo ser preparado para su configuración."
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+
+#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
+#  "tiempo fuera, etc)."
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#  "La configuración IP ya no es válida."
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#  "Claves requeridas, pero no fueron suministradas."
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+
+#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
+#  "autenticación."
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#  "Configuración del cliente 802.1X fallada."
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio PPP se ha desconectado inesperadamente."
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#  "El servicio PPP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio DHCP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio DHCP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio de conexión compartida ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+
+#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio AutoIP ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#  "El servicio AutoIP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#  "Conexión fallada porque la línea estaba ocupada."
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#  "Conexión fallada porque no había tono de llamada."
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#  "Conexión fallada porque no había portadora."
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#  "Llamada expiró por tiempo."
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#  "Llamada falló."
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#  "Fallo en inicialización de modem."
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#  "Fallo al seleccionar el punto de acceso (APN) GSM"
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#  "No se buscan redes."
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#  "Registración en la red fué rechazada."
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#  "Registración en la red expiró."
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#  "Falló la registración con la red GSM solicitada."
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#  "Control de PIN fallado."
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#  "Firmware necesario para el dispositivo puede faltar."
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#  "El dispositivo fué quitado."
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#  "NetworkManager fue dormido."
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+
+#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#  "Un usuario o cliente solicitó la desconexión."
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#  "La portadora/link del dispositivo a cambiado."
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#  "Remover amigo"
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#  "Agregar amigo"
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#  "Apagar"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#  "Reiniciar"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#  "Salir"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#  "Mis ajustes"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#  "Invitar a %s"
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#  "<b>%s</b> falló al iniciar."
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#  "Iniciando..."
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#  "Actividad falló al iniciar"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#  "Ver fuente"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#  "Parar"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#  "Empezar nuevo"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#  "Mostrar contenidos"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/view/palettes.py:229
+msgid "Remove"
+msgstr ""
+
+#  "Fuente de la instancia"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#  "Fuente"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#  "Fuente del paquete de la actividad"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#  "Fuente del paquete SugarToolkit"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#  "Ver código fuente: %r"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#  "Sugar en una ventana"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
diff --git a/po/quz.po b/po/quz.po
new file mode 100644
index 0000000..dae29d9
--- /dev/null
+++ b/po/quz.po
@@ -0,0 +1,2125 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"PO-Revision-Date: 2011-10-14 16:15+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: quz\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#  "Acerca de mí"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "nuqamanta"
+
+#  "Debe ingresar un nombre."
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "sutiyquita churay"
+
+#  "borde:   color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "muyunkuna:   lipi=%s tonalidad=%s"
+
+#  "borde:   %s"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "muyunkuna: %s"
+
+#  "relleno:     color=%s tonalidad=%s"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#  "relleno:     %s"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#  "Error en modificadores de color especificados."
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Pantay kutirichin lip'i misqakuna"
+
+#  "Error en colores especificados."
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Pantay lip'i misqakunapi"
+
+#  "Clic para cambiar su color:"
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
+msgstr "Ñ'itiy chhalanayquipaq"
+
+#  "Acerca de mi computadora"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "computadora manta"
+
+#  "No disponible"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#  "%(interface)s: %(version)s"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(interface)s: %(version)s"
+
+#  "Identidad"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "kausaypi"
+
+#  "Número de serie:"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Yupaska"
+
+#  "Software"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#  "Ensamble:"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Ensamble:"
+
+#  "Azúcar:"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Misk'i"
+
+#  "Firmware:"
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Firmware:"
+
+#  "Firmware de la red inalámbrica:"
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr "Firmware jila llika inala"
+
+#  "Licencia y derechos de autor"
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "Mañakuy Nocaq Ruaskaita"
+
+#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
+#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
+#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
+#  "se describen en ella."
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#  "Licencia completa:"
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "Lli'punte mañacuy"
+
+#  "Fecha y hora"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Kay punchay"
+
+#  "Error, zona horaria no existe."
+#: ../extensions/cpsection/datetime/model.py:92
+#, fuzzy
+msgid "Error timezone does not exist."
+msgstr "Pantasonque yau"
+
+#  "Zona horaria"
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Punchaycuna"
+
+#  "Cuadro"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "muyuycunapi"
+
+#  "El valor debe ser un número entero."
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "Tucuy kanan huk llipin yupana"
+
+#  "nunca"
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "haykaqpis"
+
+#  "instantáneo"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "usqhay"
+
+#  "%s segundos"
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr "%s iskay kaq"
+
+#  "Retraso de activación"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "qallariy qhipay"
+
+#  "Esquina"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Muyurina"
+
+#  "Borde"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "muyumnim"
+
+#  "Teclado"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr "Ñit'ina"
+
+#  "Modelo de teclado"
+#: ../extensions/cpsection/keyboard/view.py:190
+#, fuzzy
+msgid "Keyboard Model"
+msgstr "Sumaq ñit'ina chhalay"
+
+#  "Tecla(s) para cambiar el diseño"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr "Ñit'ina ruranapaq"
+
+#  "Diseño(s) de teclado"
+#: ../extensions/cpsection/keyboard/view.py:319
+#, fuzzy
+msgid "Keyboard Layout(s)"
+msgstr "Ñit'ina chhalay"
+
+#  "Idioma"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Simi"
+
+#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "Mana aticunchu waykuy ~/.i18n."
+
+#  "El lenguaje del código=%s no pudo ser determinado."
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#  "Lo siento, yo no hablo '%s'."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format, fuzzy
+msgid "Sorry I do not speak '%s'."
+msgstr "Sentine, mana rimanichi '%s'."
+
+#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+#  "disponible, se usará la siguiente en la lista."
+#: ../extensions/cpsection/language/view.py:57
+#, fuzzy
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr "Huk rimay managanchu warza ruway."
+
+#  "Configuración del módem"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#  "Nombre de usuario:"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr "Runa Suti:"
+
+#  "Contraseña:"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#  "Número:"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr "Yupay:"
+
+#  "Nombre de punto de acceso (APN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#  "Número de identificación personal (PIN):"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#  "Clave personal de desbloqueo (PUK):"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#  "Necesitará proveer la información siguiente para configurar una conexión de "
+#  "banda ancha (3G) de red de telefonía celular."
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#  "Red"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Llik'a"
+
+#  "Estado desconocido."
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Ima mana riqsiska"
+
+#  "Error en argumento especificado de radio use on/off."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#  "Error en argumento especificado use 0/1."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#  "Inalámbrica"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#  "Apague la radio inalámbrica y ahorre vida de batería"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#  "Radio"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "Uyarinapaq"
+
+#  "Descarte el historial de la red si tiene problemas de conexión"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#  "Descarte historial de la red"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#  "Colaboración"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
+#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#  "Servidor:"
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#  "Energía"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#  "Error en argumento automático de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#  "Error en argumento extremo de manejo de energía, use on/off."
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#  "Manejo de energía"
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#  "Manejo automático de energía (incrementa la vida de la batería)"
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
+#  "duración de la batería)"
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#  "Actualización de software"
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+#  "de seguridad y proveen nuevas características."
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#  "Probando %s..."
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#  "Descargando %s..."
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#  "Actualizando %s..."
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#  "Tu software esta actualizado"
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#  "Puedes instalar %s actualización"
+#  "Puedes instalar %s actualizaciones"
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Buscando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#  "Instalando actualizaciones..."
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#  "%s actualización fue instalada"
+#  "%s actualizaciones fueron instaladas"
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#  "Instalación seleccionada"
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#  "Tamaño de descarga: %s"
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#  "Ninguno"
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#  "1 KB"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#  "%.0f KB"
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#  "%.1f MB"
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#  "Mi batería"
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#  "Eliminado"
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#  "Cargando"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#  "Queda muy poca batería"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#  "Quedan %(hour)d:%(min).2d"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#  "Cargada"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#  "Direccion IP: %s"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#  "Desconectar"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#  "Conectando..."
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#  "Conectado"
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#  "No hay conexión inalámbrica"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#  "Canal"
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#  "Red Cableada"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#  "Velocidad"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#  "Módem inalámbrico"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#  "Espere por favor..."
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#  "Conectar"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#  "Desconectado"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#  "Cancelar"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#  "Probar la conexión nuevamente"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#  "Error: %s"
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#  "Sugerencia: %s"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#  "Conectado a %s"
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#  "%d KB"
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#  "Revise la configuración de su Pin/Puk."
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#  "Revise la configuración del nombre de su punto de acceso (APN)"
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#  "Revise el Número en la configuración."
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#  "Revise su configuración."
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#  "Red Malla"
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#  "Red Malla %s"
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#  "No se dispone de conexión GSM."
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#  "Crear una conexión en el panel de control."
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#  "Mis parlantes"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#  "Dar voz"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#  "Silenciar"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#  "dedo"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#  "estilo"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#  "Mi superficie táctil"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#  "Malla"
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#  "Grupo"
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#  "Hogar"
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#  "Actividad"
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "Ruwana"
+
+#  "Captura de pantalla"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#  "Captura pantalla de \"%s\""
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
+#  "para reutilizar el nombre largo de la cuenta UNIX."
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#  "Directorios adicionales que pueden contener traducciones actualizadas."
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#  "URL de Respaldo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#  "Bundle IDs de actividades protegidas"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
+#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
+#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#  "Retraso de las Esquinas"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#  "Tipo de letra predeterminado"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#  "Tamaño de letra predeterminado"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#  "Apodo predeterminado"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando las esquinas."
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#  "Retraso para la activación del cuadro utilizando los bordes."
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#  "Directorio a buscar para traducciones"
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#  "Retraso del Borde"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#  "Diseño de favoritos"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#  "Modo de reanudar favoritos"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#  "Tipo de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#  "Tamaño de letra que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#  "APN de la red GSM"
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#  "PIN de la red GSM"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#  "PUK de la red GSM"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#  "Número de la red GSM"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#  "Contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#  "Configuración de la contraseña de la red GSM"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#  "Configuración del numero de identificación personal (PIN) de la red GSM"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#  "Configuración del número de teléfono de la red GSM"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#  "Nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#  "Configuración del nombre de usuario de la red GSM"
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
+#  "Jabber."
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
+#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
+#  "automáticamente a una red ad-hoc."
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#  "Servidor Jabber"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#  "Distribuciones del teclado"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#  "Modelo del teclado"
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#  "Opciones del teclado"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#  "Distribución de las actividades favoritas."
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
+#  "distribución(variante)"
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#  "Lista de las opciones del teclado."
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#  "Manejo automática de energía"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#  "Manejo automática de energía."
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#  "Manejo extremo de energía"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#  "Manejo extremo de energía."
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#  "Publicar en Gadget"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#  "Configuración para silenciar el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#  "Mostrar Terminar Sesión"
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#  "Mostrar Reiniciar"
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#  "Mostrar redes específicas de Azúcar"
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#  "Sonido silenciado"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#  "El modelo del teclado que se utilizará"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#  "Configuración de zona horaria para el sistema."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#  "URL del servidor de Jabber para usar."
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#  "URL donde se guarda el backup."
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#  "Color del usuario"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#  "Nombre de usuario"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#  "Nombre de usuario que se utiliza en todo el escritorio."
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
+#  "lista."
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#  "Nivel de volumen"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#  "Nivel de volumen para el dispositivo de sonido."
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
+#  "que se retome la última entrada de esa actividad."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
+#  "módulo %s: %r"
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#  "sugar-control-panel: clave=%s no es una opción disponible"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#  "sugar-control-panel: %s"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
+#  "    Control para el ambiente de sugar. \n"
+#  "    Opciones: \n"
+#  "    -h               muestra este mensaje de ayuda y sale \n"
+#  "    -l                enumera todas las opciones disponibles \n"
+#  "    -h clave       muestra la información sobre esta clave \n"
+#  "    -g clave       obtiene el valor actual de la clave \n"
+#  "    -s clave       establece el valor actual de la clave \n"
+#  "    -c clave  vaciar el valor actual de la clave \n"
+#  "    "
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#  "Advertencia"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#  "Los cambios requieren reiniciar"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#  "Cancelar cambios"
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#  "Después"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#  "Reiniciar ahora"
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#  "Hecho"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#  "Versión %s"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#  "Confirmar borrado"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#  "Guardar"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#  "Borrar"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#  "Remover favorito"
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#  "Hacer favorito"
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#  "Forma libre"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#  "Anillo"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#  "Espiral"
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#  "Caja"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#  "Triángulo"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#  "Error al registrar"
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#  "%s"
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#  "Registro exitoso"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#  "Ahora estás registrado en el servidor de colegio."
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#  "Registro"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#  "Registrar nuevamente"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#  "Actualización de Software"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#  "Pruebe ahora"
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#  "Vista en lista"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#  "<Ctrl>2"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#  "Vista de favoritos"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#  "<Ctrl>1"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#  "Tipo de clave:"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#  "Tipo de autenticación:"
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#  "WPA y WPA2 Personal"
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#  "Seguridad inalámbrica:"
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#  "Retomar"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#  "Unirse"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#  "Red específica %d"
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#  "Red Malla %d"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#  "No se puede conectar al servidor."
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#  "El servidor no pudo completar el pedido."
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#  "Rechazar"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#  "%dB"
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#  "%dKB"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#  "%dMB"
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#  "%s de %s"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#  "Transferencia desde %s"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#  "Aceptar"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#  "%s (%s)"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#  "Descartar"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#  "El otro participante canceló la transferencia del archivo"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#  "Transferir a %s"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgid "Remove"
+msgstr ""
+
+#  "Abrir"
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#  "Abrir con"
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#  "recorte de %s"
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#  "Vecindario"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#  "F1"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#  "F2"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#  "F3"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#  "F4"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#  "Nombre:"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#  "Clic para cambiar de color:"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#  "Atrás"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#  "Siguiente"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#  "Sin título"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#  "Sin vista previa"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#  "Tipo: %s"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#  "Desconocido"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#  "Fecha: %s"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#  "Tamaño: %s"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#  "Sin fecha"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#  "Participantes:"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#  "Descripción:"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#  "Etiquetas:"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#  "Diario"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#  "Buscar"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#  "Cualquier momento"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#  "Hoy"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#  "Desde ayer"
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#  "Última semana"
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#  "Último mes"
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#  "Último año"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#  "Mis amigos"
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#  "Mi clase"
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#  "Cualquiera"
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#  "Copiar a"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#  "Duplicar"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#  "Error mientras se copiaba la entrada. %s"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#  "Error"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#  "Iniciar"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#  "Ordenar por fecha de modificación"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#  "Ordenar por fecha de creación"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#  "Ordenar por tamaño"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#  "Ordenar vista"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#  "Su diario está vacío"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#  "Tu carpeta de documentos está vacía"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#  "El dispositivo está vacío"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#  "No hay entradas coincidentes"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#  "Limpiar búsqueda"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#  "Versión más antigua de la actividad %s"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#  "¿Desea instalar la versión %s, mas antigua?    "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#  "Su diario está lleno"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
+#  "nuevas entradas."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#  "Mostrar diario"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#  "Escoja un objeto"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#  "Cerrar"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#  "Reiniciar con"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#  "Empezar con"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#  "No se encontró una actividad para iniciar la entrada"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#  "Enviar a"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#  "Ver detalles"
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#  "Las entradas sin un archivo no pueden ser enviadas."
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#  "Entradas sin un archivo no pueden ser copiadas."
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#  "Portapapeles"
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#  "No hay amigos presentes"
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#  "No se encontró una conexión válida"
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#  "No se encontró una actividad para retomar la entrada"
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#  "Documentos"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#  "%(free_space)d MB libres"
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#  "La razón para el cambio de estado del dispositivo es desconocida."
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#  "El cambio de estado es normal."
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#  "El dispositivo está siendo administrado."
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#  "El dispositivo ya no está siendo administrado."
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#  "El dispositivo no pudo ser preparado para su configuración."
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
+#  "tiempo fuera, etc)."
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#  "La configuración IP ya no es válida."
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#  "Claves requeridas, pero no fueron suministradas."
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
+#  "autenticación."
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#  "Configuración del cliente 802.1X fallada."
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio PPP se ha desconectado inesperadamente."
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#  "El servicio PPP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#  "El servicio DHCP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio DHCP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio de conexión compartida ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#  "El servicio AutoIP ha fallado al iniciar."
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#  "El servicio AutoIP ha reportado un error inesperado."
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#  "Conexión fallada porque la línea estaba ocupada."
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#  "Conexión fallada porque no había tono de llamada."
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#  "Conexión fallada porque no había portadora."
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#  "Llamada expiró por tiempo."
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#  "Llamada falló."
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#  "Fallo en inicialización de modem."
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#  "Fallo al seleccionar el punto de acceso (APN) GSM"
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#  "No se buscan redes."
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#  "Registración en la red fué rechazada."
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#  "Registración en la red expiró."
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#  "Falló la registración con la red GSM solicitada."
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#  "Control de PIN fallado."
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#  "Firmware necesario para el dispositivo puede faltar."
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#  "El dispositivo fué quitado."
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#  "NetworkManager fue dormido."
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#  "Un usuario o cliente solicitó la desconexión."
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#  "La portadora/link del dispositivo a cambiado."
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#  "Remover amigo"
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#  "Agregar amigo"
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#  "Apagar"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#  "Reiniciar"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#  "Salir"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#  "Mis ajustes"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#  "Invitar a %s"
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#  "<b>%s</b> falló al iniciar."
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#  "Iniciando..."
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#  "Actividad falló al iniciar"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#  "Ver fuente"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#  "Parar"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#  "Empezar nuevo"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#  "Mostrar contenidos"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#  "Eliminar"
+#: ../src/jarabe/view/palettes.py:229
+msgid "Remove"
+msgstr ""
+
+#  "Fuente de la instancia"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#  "Fuente"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#  "Fuente del paquete de la actividad"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#  "Fuente del paquete SugarToolkit"
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#  "Ver código fuente: %r"
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#  "Sugar en una ventana"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 69b541f..a8dbe79 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-01-07 18:20+0000\n"
 "Last-Translator: David Lazar <david@davidlazar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,405 +15,1790 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "Nume:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Înapoi"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "Gata"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "Următor"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "Şterge prieten"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "Adaugă prieten"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "Deschide"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "Adaugă la jurnal"
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, fuzzy
+msgid "%s seconds"
+msgstr "%d secunde"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "Reia"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "Oprește"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "Reporneşte"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "Înregistrează"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "Durata bateriei mele"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "Bateria se încarcă"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "Bateria se descarcă"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Gata"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Anulează"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Acasă"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Activitate"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "Păstrează"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "Anulează"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "Refă"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "Copiază"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "Lipeşte"
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "Anulează"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Gata"
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "Continuă"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d an"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Păstrează"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Înregistrează"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Reia"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
-msgstr "%d ani"
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d month"
-msgstr "%d lună"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
-msgstr "%d luni"
+msgid "%dB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
-msgstr "%d săptămână"
+msgid "%dKB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
-msgstr "%d săptămâni"
+msgid "%dMB"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
-msgstr "%d zi"
+msgid "%s of %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
-msgstr "%d zile"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
-msgstr "%d oră"
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
-msgstr "%d ore"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Deschide"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
-msgstr "%d minut"
+msgid "%s clipping"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Nume:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Înapoi"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "Următor"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
-msgstr "%d minute"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
-msgstr "%d secundă"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
-msgstr "%d secunde"
+msgid "Size: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr " şi "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Şterge prieten"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Adaugă prieten"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Oprește"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "Adaugă la jurnal"
+
+#~ msgid "Reboot"
+#~ msgstr "Reporneşte"
+
+#~ msgid "My Battery life"
+#~ msgstr "Durata bateriei mele"
+
+#~ msgid "Battery charging"
+#~ msgstr "Bateria se încarcă"
+
+#~ msgid "Battery discharging"
+#~ msgstr "Bateria se descarcă"
+
+#~ msgid "Undo"
+#~ msgstr "Anulează"
+
+#~ msgid "Redo"
+#~ msgstr "Refă"
+
+#~ msgid "Copy"
+#~ msgstr "Copiază"
+
+#~ msgid "Paste"
+#~ msgstr "Lipeşte"
+
+#~ msgid "Continue"
+#~ msgstr "Continuă"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d an"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d ani"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d lună"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d luni"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d săptămână"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d săptămâni"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d zi"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d zile"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d oră"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d ore"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d minut"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d minute"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d secundă"
+
+#~ msgid " and "
+#~ msgstr " şi "
+
+#~ msgid ", "
+#~ msgstr ", "
diff --git a/po/rw.po b/po/rw.po
index 9666f76..807f723 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-20 07:47-0400\n"
-"PO-Revision-Date: 2011-06-02 04:38+0200\n"
+"PO-Revision-Date: 2011-10-06 09:38+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: rw\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1) ;\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -483,8 +483,9 @@ msgid "Connected"
 msgstr "Byahujwe"
 
 #: ../extensions/deviceicon/network.py:130
+#, fuzzy
 msgid "No wireless connection"
-msgstr ""
+msgstr "Nta kwihuza"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -667,8 +668,9 @@ msgid "Corner Delay"
 msgstr "Gutinda kw'inguni"
 
 #: ../data/sugar.schemas.in.h:7
+#, fuzzy
 msgid "Default font face"
-msgstr ""
+msgstr "Imyandikire yizanamo"
 
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
@@ -872,8 +874,9 @@ msgid "User Color"
 msgstr "Koresha Ibara"
 
 #: ../data/sugar.schemas.in.h:57
+#, fuzzy
 msgid "User Name"
-msgstr ""
+msgstr "Izina ry'ukoresha"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
@@ -981,9 +984,9 @@ msgid "Ok"
 msgstr "Ok"
 
 #: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
+#, python-format, fuzzy
 msgid "Version %s"
-msgstr ""
+msgstr "Verisiyo %s"
 
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
@@ -1029,8 +1032,9 @@ msgstr "Isone"
 
 #. TRANS: label for the spiral layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:402
+#, fuzzy
 msgid "Spiral"
-msgstr ""
+msgstr "Nyamwihinahine"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:472
@@ -1179,8 +1183,9 @@ msgid "Transfer from %s"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:569
+#, fuzzy
 msgid "Accept"
-msgstr ""
+msgstr "Kwemera"
 
 #: ../src/jarabe/frame/activitiestray.py:592
 #: ../src/jarabe/frame/activitiestray.py:722
@@ -1278,7 +1283,7 @@ msgstr ""
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
-msgstr ""
+msgstr "Kitazwi"
 
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
@@ -1367,13 +1372,15 @@ msgstr "Icyo aricyo cyose"
 
 #: ../src/jarabe/journal/journaltoolbox.py:381
 #: ../src/jarabe/journal/palettes.py:93
+#, fuzzy
 msgid "Copy to"
-msgstr ""
+msgstr "Gukoporora ku"
 
 #: ../src/jarabe/journal/journaltoolbox.py:389
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+#, fuzzy
 msgid "Duplicate"
-msgstr ""
+msgstr "Gusubiramo"
 
 #: ../src/jarabe/journal/journaltoolbox.py:422
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
@@ -1480,8 +1487,9 @@ msgid "Send to"
 msgstr ""
 
 #: ../src/jarabe/journal/palettes.py:121
+#, fuzzy
 msgid "View Details"
-msgstr ""
+msgstr "Kwerekana Birambuye"
 
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
@@ -1493,8 +1501,9 @@ msgid "Entries without a file cannot be copied."
 msgstr ""
 
 #: ../src/jarabe/journal/palettes.py:267
+#, fuzzy
 msgid "Clipboard"
-msgstr ""
+msgstr "Ububikokoporora"
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
@@ -1509,8 +1518,9 @@ msgid "No activity to resume entry"
 msgstr ""
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
+#, fuzzy
 msgid "Documents"
-msgstr ""
+msgstr "Inyandiko"
 
 #: ../src/jarabe/journal/volumestoolbar.py:391
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
@@ -1702,8 +1712,9 @@ msgid "Restart"
 msgstr "Kongera gutangira"
 
 #: ../src/jarabe/view/buddymenu.py:101
+#, fuzzy
 msgid "Logout"
-msgstr ""
+msgstr "Gufunga"
 
 #: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
@@ -1737,8 +1748,9 @@ msgid "Stop"
 msgstr "Hagarara"
 
 #: ../src/jarabe/view/palettes.py:139
+#, fuzzy
 msgid "Start new"
-msgstr ""
+msgstr "Gutangira a Gishya"
 
 #: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
@@ -1755,8 +1767,9 @@ msgid "Instance Source"
 msgstr ""
 
 #: ../src/jarabe/view/viewsource.py:312
+#, fuzzy
 msgid "Source"
-msgstr ""
+msgstr "Inkomoko"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
diff --git a/po/sd.po b/po/sd.po
index e184567..7fd0d5d 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,221 +16,874 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/intro.py:145
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -240,278 +893,821 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
-msgid "Changes require restart"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:253
-msgid "Cancel changes"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
-msgid "Later"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
-msgid "Restart now"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "stroke:   %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "fill:     %s"
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%s clipping"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/view/palettes.py:71
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:169
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 63d4e34..7fd0d5d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 6981824..2f2c303 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2009-02-28 04:26-0500\n"
 "Last-Translator: Denis Oštir <denis.ostir@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,43 +19,39 @@ msgstr ""
 msgid "About Me"
 msgstr "O meni"
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr "Vpisati morat ime."
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "pisalo:   barva=%s odtenek=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr "pisalo:   %s"
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "zapolni:     barva=%s odtenek=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr "zapolni:     %s"
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr "Napačno določena sprememba barve"
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr "Napačno določena barva"
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr "Ime:"
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr "Klikni za spremembo barve:"
 
@@ -63,48 +59,48 @@ msgstr "Klikni za spremembo barve:"
 msgid "About my Computer"
 msgstr "O mojem računalniku"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr "Identiteta"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr "Serijska številka:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr "Program"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr "Različica:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr "Brezžična oprema:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr "Lastnik pravic"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr "© 2008 One Laptop per Child Association Inc, Red Hat Inc in sodelavci."
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -116,7 +112,7 @@ msgstr ""
 "lahko spreminjate in/ali distribuirate, a pod nekaterimi pogoji, zapisanimi "
 "v omenjeni licenci."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr "Licenčne pravice:"
 
@@ -124,11 +120,11 @@ msgstr "Licenčne pravice:"
 msgid "Date & Time"
 msgstr "Datum in ura"
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr "Napaka: časovno območje ne obstaja."
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr "Časovno območje"
 
@@ -136,97 +132,154 @@ msgstr "Časovno območje"
 msgid "Frame"
 msgstr "Okvir"
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr "Vrednost mora biti številka."
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr "nikoli"
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr "takojšnji"
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr "%s sekund"
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr "Zamik aktivacije"
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr "Kot"
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr "Rob"
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr "Jezik"
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Dostop do ~/.i18n ni mogoče. Ustvari standardne nastavitve."
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "Jezika za kodo=%s ni bilo mogoče določiti."
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Oprosti, ne govorim '%s'."
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr "Neznana država."
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr "Napaka pri določanju stanja radijske povezave (vključen/izključen)."
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr "Napaka pri uporabi podatka 0/1."
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "Brezžično"
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr "Izklopi brezžično radijsko povezavo za podaljšanje trajanja baterije"
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr "Radijska povezava:"
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr "Zavrži zgodovino mreže, če imate težave pri povezavi z mrežo"
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr "Zavrži zgodovino mreže"
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "Sodelovanje"
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
@@ -235,7 +288,7 @@ msgstr ""
 "Strežnik predstavlja sobo v kateri se nahajate. Uporabniki na istem "
 "strežniku se lahko vidijo, tudi če niso priključeni na isto omrežje."
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "Strežnik:"
 
@@ -243,145 +296,458 @@ msgstr "Strežnik:"
 msgid "Power"
 msgstr "Energija"
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr "Napaka pri samodejni rabi ukaza pm, uporabi izklop/vklop."
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr "Napaka pri ekstremni vrednosti ukaza pm, uporabi izklop/vklop."
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr "Nazdor porabe električne energije"
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 "Samodejni nadzor porabe električne energije (podalšuje življenjsko dobo "
 "baterije)"
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
+#, fuzzy
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 "Ekstremni nadzor porabe električne energije (ugasnjen radijski del, podaljša "
 "življenjsko dobo baterije)"
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/cpsection/updater/__init__.py:21
+#, fuzzy
+msgid "Software update"
+msgstr "Nadgradnja programa"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Končano"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Moja baterija"
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr "Odstranjeno"
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Polnjenje"
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "Baterija je skoraj prazna"
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "Ostaja %(hour)d:%(min).2d"
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "Polno"
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr "IP naslov: %s"
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
-msgstr "Prekini ... "
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Prekini"
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:247
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr "Povezujem ..."
 
 # TODO: show the channel number
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:253
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr "Žično omrežje"
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Poveži"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Odklopljen"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format, fuzzy
+msgid "%d KB"
+msgstr "%dKB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Omrežje Mesh"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "Omrežje Mesh"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "Moji zvočniki"
 
 # malo težko je UNMUTE prevest drugače
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "Glasno"
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Tiho"
 
-#: ../extensions/globalkey/screenshot.py:50
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "Mesh"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr "Skupina"
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr "Domov"
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr "Aktivnost"
+
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr "Slika zaslona"
 
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
 #: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr "Nadomestni spletni naslov"
 
-#: ../data/sugar.schemas.in.h:2
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+#, fuzzy
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 "Barva ikone XO, ki jo uporabljate na celotnem namizju. Zaporedje je "
 "sestavljeno iz barve črte in barve polnila v formatu RGB. Primer: "
 "#AC32FF,#9A5200"
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr "Zamik pri kotu"
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr "Zamik pri prikazu okvirja ob premiku v kot"
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr "Zamik pri prikazu okvirja ob premiku na rob"
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr "Zamik ob robu"
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr "Izgled priljubljenih"
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr "Način ponovitve priljubljenih"
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+#, fuzzy
+msgid "Font face that is used throughout the desktop."
+msgstr "Uporabnikovo ime, ki se uporablja po celotnem namizju."
+
+#: ../data/sugar.schemas.in.h:17
+#, fuzzy
+msgid "Font size that is used throughout the desktop."
+msgstr "Uporabnikovo ime, ki se uporablja po celotnem namizju."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
@@ -389,75 +755,132 @@ msgstr ""
 "Če je oznaka DA, bo Sugar omogočil vidnost drugim uporabnikom na strežniku "
 "Jabber"
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr "Strežnik Jabber"
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr "Izgled pogleda priljubljenih"
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr "Samodejno upravljanje z elektriko"
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr "Samodejno upravljanje z elektriko"
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr "Ekstremno upravljanje z elektriko"
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr "Ekstremno upravljanje z elektriko"
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr "Objavi v napravi"
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr "Nastavitev utišanja zvočne naprave"
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr "Zvok utišan"
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr "Nastavitev časovnega pasu za sistem"
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr "Spletni naslov uporabljenega strežnika jabber"
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr "Spletni naslov arhiva"
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr "Barva uporabnika"
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr "Uporabnikovo ime"
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr "Uporabnikovo ime, ki se uporablja po celotnem namizju."
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr "Raven glasnosti"
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr "Raven glasnosti za zvočno napravo."
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -488,7 +911,7 @@ msgstr "nadzorna plošča programa sugar: %s"
 # which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -512,532 +935,853 @@ msgstr ""
 "    -c tipka               izbriši trenurno vrednost tipke \n"
 "    "
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Za uveljavitev sprememb je potreben ponovni zagon programa sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:275
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/jarabe/controlpanel/gui.py:276
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Sprembe zahtevajo ponovni zagon"
 
-#: ../src/jarabe/controlpanel/gui.py:279
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Prekliči spremembe"
 
-#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Kasneje"
 
-#: ../src/jarabe/controlpanel/gui.py:288
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Ponovni zagon"
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr "Končano"
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:687
-#: ../src/jarabe/frame/activitiestray.py:766
-#: ../src/jarabe/frame/activitiestray.py:794
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:338
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "V redu"
 
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Potrdi brisanje"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Potrdi brisanje: Želiš dokočno izbrisati %s?"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Obdrži"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Izbriši"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Odstrani priljubljeno"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "Nastavi priljubljeno"
+
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr "Prostoročno"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr "Obroč"
 
 # TRANS: label for the spiral layout in the favorites view
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:332
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr "Spirala"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:399
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr "Okvir"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:440
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr "Trikotnik"
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr "Registracija ni uspela"
 
-#: ../src/jarabe/desktop/favoritesview.py:330
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr "Uspešna registracija"
 
-#: ../src/jarabe/desktop/favoritesview.py:333
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr "Vpisan si v šolski strežnik."
 
-#: ../src/jarabe/desktop/favoritesview.py:668
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr "Registracija"
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
-msgstr "Potrdi brisanje"
-
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "Potrdi brisanje: Želiš dokočno izbrisati %s?"
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
-msgid "Keep"
-msgstr "Obdrži"
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
-msgid "Erase"
-msgstr "Izbriši"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr "Nadgradnja programa"
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 "Nadgradite aktivnosti, da zagotovite ustreznost z novo programsko opremo."
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr "Preveri zdaj"
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr "Seznam"
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr "Priljubljene"
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr "Tip ključa:"
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr "Tip prepoznave:"
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr "WPA in WPA2 Osebni ključ"
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr "Varovanje brezžičnega omrežja:"
 
-#: ../src/jarabe/desktop/meshbox.py:131
-msgid "Connect"
-msgstr "Poveži"
-
-#: ../src/jarabe/desktop/meshbox.py:135
-msgid "Disconnect"
-msgstr "Prekini"
-
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:441
-#: ../src/jarabe/frame/activitiestray.py:711
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Nadaljuj"
 
-#: ../src/jarabe/desktop/meshbox.py:446
-#: ../src/jarabe/frame/activitiestray.py:227
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../src/jarabe/desktop/schoolserver.py:34
-msgid "Cannot obtain data needed for registration."
-msgstr "Ne morem pridobiti podatkov, potrebnih za registracijo."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Omrežje Mesh"
 
-#: ../src/jarabe/desktop/schoolserver.py:51
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr "Povezava s strežnikom ni mogoča."
 
-#: ../src/jarabe/desktop/schoolserver.py:56
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr "Strežnik ne more izpolniti zahteve."
 
-#: ../src/jarabe/frame/activitiestray.py:232
-#: ../src/jarabe/frame/activitiestray.py:659
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr "Zavrni"
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
-#: ../src/jarabe/frame/activitiestray.py:614
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
-#: ../src/jarabe/frame/activitiestray.py:616
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr "%dMB"
 
-#: ../src/jarabe/frame/activitiestray.py:633
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
-#: ../src/jarabe/frame/activitiestray.py:644
-#, python-format
-msgid "Transfer from %r"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format, fuzzy
+msgid "Transfer from %s"
 msgstr "Prenesi z %r"
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: ../src/jarabe/frame/activitiestray.py:677
-#: ../src/jarabe/frame/activitiestray.py:784
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:755
-#, python-format
-msgid "Transfer to %r"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format, fuzzy
+msgid "Transfer to %s"
 msgstr "Prenesi na %r"
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr "Odpri"
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr "Odpri z"
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr "%s strižem"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr "Soseščina"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
-msgstr "Skupina"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
-msgstr "Domov"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "Aktivnost"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr "Klikni za spremembo barve:"
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr "Nazaj"
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "Naslednji"
 
-#: ../src/jarabe/journal/collapsedentry.py:258
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr "Predogled ni na voljo"
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "Brez datuma"
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr "Udeleženci:"
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr "Oznake:"
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Beležka"
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr "Išči"
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr "Danes"
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr "Od včeraj"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr "V zadnjem tednu"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr "V zadnjem mesecu"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr "V zadnjem letu"
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr "Moji prijatelji"
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr "Moj razred"
 
 # TRANS: Item in a combo box that filters by entry type.
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr "Karkoli"
 
-# TODO: Add "Start with" menu item
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
-msgstr "Kopiraj"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Zaženi"
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "Tvoja beležka je prazna"
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+#, fuzzy
+msgid "No matching entries"
 msgstr "Ne najdem vsebine za "
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr "Počisti iskanje"
 
-#: ../src/jarabe/journal/misc.py:91
-msgid "No date"
-msgstr "Brez datuma"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "Tvoja beležka je polna"
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr "Izbriši starejše vpise v beležko, da narediš prostor za nove."
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "Prikaži beležko"
 
-#: ../src/jarabe/journal/objectchooser.py:147
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr "Izberi predmet"
 
-#: ../src/jarabe/journal/objectchooser.py:152
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr "Nadaljuj z"
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr "Začni z"
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "Ni aktivnosti za začetek"
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr "Pošlji"
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr "Poglej podrobnosti"
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr "Prisoten ni noben prijatelj"
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr "Na voljo ni nobena veljavna povezava"
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr "Ni aktivnosti za nadaljevanje"
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
-msgstr "Ni aktivnosti za začetek"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+#, fuzzy
+msgid "Documents"
+msgstr "Dokument"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB prosto"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr "Odstrani prijatelja"
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr "Dodaj prijatelja"
 
-#: ../src/jarabe/view/buddymenu.py:82
-msgid "My Settings"
-msgstr "Moje nastavitve"
-
-#: ../src/jarabe/view/buddymenu.py:90
-msgid "Logout"
-msgstr "Odjava"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Zaustavitev"
 
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
 msgstr "Ponovni zagon"
 
-#: ../src/jarabe/view/buddymenu.py:100
-msgid "Shutdown"
-msgstr "Zaustavitev"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr "Odjava"
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr "Moje nastavitve"
 
-#: ../src/jarabe/view/buddymenu.py:135
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr "Povabi na %s"
 
-#: ../src/jarabe/view/palettes.py:47
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "Zaganjam ..."
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:73
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr "Poglej izvor"
 
-#: ../src/jarabe/view/palettes.py:84
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ../src/jarabe/view/palettes.py:171
-msgid "Remove favorite"
-msgstr "Odstrani priljubljeno"
-
-#: ../src/jarabe/view/palettes.py:175
-msgid "Make favorite"
-msgstr "Nastavi priljubljeno"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../src/jarabe/view/palettes.py:238
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "Prikaži vsebino"
 
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB prosto"
-
-#: ../src/jarabe/view/palettes.py:285
-msgid "Unmount"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr "Primer izvora"
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr "Izvor kompleta aktivnosti"
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr "Poglej vir: %r"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid ""
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+#~ msgstr "© 2008 One Laptop per Child Association Inc, Red Hat Inc in sodelavci."
+
+#~ msgid "Disconnect..."
+#~ msgstr "Prekini ... "
+
+#~ msgid "Cannot obtain data needed for registration."
+#~ msgstr "Ne morem pridobiti podatkov, potrebnih za registracijo."
+
+# TODO: Add "Start with" menu item
+#~ msgid "Copy"
+#~ msgstr "Kopiraj"
+
+#~ msgid "Unmount"
+#~ msgstr "Odstrani"
 
 #~ msgid "Resume by default"
 #~ msgstr "Vedno nadaljuj"
@@ -1048,18 +1792,9 @@ msgstr "Poglej vir: %r"
 #~ msgid "Disconnecting..."
 #~ msgstr "Prekinjam ..."
 
-#~ msgid "Mesh Network"
-#~ msgstr "Omrežje Mesh"
-
-#~ msgid "Disconnected"
-#~ msgstr "Odklopljen"
-
 #~ msgid "About my XO"
 #~ msgstr "O mojem XO"
 
-#~ msgid "Mesh"
-#~ msgstr "Mesh"
-
 #~ msgid "Connected to a School Mesh Portal"
 #~ msgstr "Povezan na šolski Mesh portal"
 
diff --git a/po/sv.po b/po/sv.po
index b70c9d4..3512401 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-05 00:31-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2010-02-03 22:14+0200\n"
 "Last-Translator: Nicci Manns <nicci@saunalahti.fi>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,44 +21,40 @@ msgstr ""
 msgid "About Me"
 msgstr "Om mig"
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr "Du måste ange ett namn."
 
 # Varför ska detta översättas? Är det inte direkta kommandon till grafikuppritaren?
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "stroke:   color=%s hue=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr "stroke:   %s"
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "fill:     color=%s hue=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr "fill:     %s"
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr "Error in specified color modifiers."
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr "Fel i angivna färger."
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr "Namn:"
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr "Klicka för att ändra din färg:"
 
@@ -66,43 +62,48 @@ msgstr "Klicka för att ändra din färg:"
 msgid "About my Computer"
 msgstr "Om min dator"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr "Finns inte tillgänglig"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr "Serienummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr "Programvara"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr "Byggnummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr "Sockerversion:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr "Fast mjukvara:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr "Trådlös fast mjukvara:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr "Copyright och Licens"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +114,7 @@ msgstr ""
 "är fri programvara och licenserad under GNU GPL vilket innebär att du fritt "
 "får ändra programmet och/eller sprida vidare kopior av programmet."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr "Detaljerad licens:"
 
@@ -121,11 +122,11 @@ msgstr "Detaljerad licens:"
 msgid "Date & Time"
 msgstr "Datum och tid"
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr "Fel: Tidszonen finns inte."
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr "Tidszon"
 
@@ -133,50 +134,50 @@ msgstr "Tidszon"
 msgid "Frame"
 msgstr "Ram"
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr "Talet måste vara ett heltal."
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr "aldrig"
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr "direkt"
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr "efter %s sekunder"
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr "Tid tills aktivering"
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr "Hörn"
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr "Kant"
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr "Tangentbordstyp"
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr "Tangent för att växla mellan tangentbordstyper"
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr "Tangentbordstyp"
 
@@ -185,21 +186,21 @@ msgstr "Tangentbordstyp"
 msgid "Language"
 msgstr "Språk"
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Kunde inte komma åt ~/.i18n. Skapar standardinställningar."
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "Kunde inte avgöra vilket språk det är som har koden %s."
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Tyvärr så pratar jag inte '%s'."
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
@@ -208,50 +209,84 @@ msgstr ""
 "översättning i det översta språket kommer texten visas i den näst översta "
 "osv."
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr "Status är okänd."
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr "Fel i angiven trådlös nätverksinställning. Använd på eller av."
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr "Fel i angivet argument. Använd 0/1"
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "Trådlöst nätverk"
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr "Stäng av det trådlösa nätverket för att få batteriet att räcka längre"
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr "Trådlöst nätverk"
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 "Ta bort nätverkshistoriken om du har problem med att ansluta till ett "
 "nätverk"
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr "Ta bort nätverkshistorik"
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "Samarbete"
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
@@ -260,7 +295,7 @@ msgstr ""
 "Servern motsvarar det rum som du är i; de som är på samma server kan se "
 "varandra även när de inte är på samma nätverk."
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "Server:"
 
@@ -268,34 +303,34 @@ msgstr "Server:"
 msgid "Power"
 msgstr "Ström"
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr "Fel i angiven strömbesparingsinställning. Använd på eller av."
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr "Fel i angiven extrem strömbesparingsinställning. Använd på eller av."
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr "Strömhantering"
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr "Automatisk strömhantering (förlänger tiden som batteriet varar)"
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
-"Extrem strömhantering (stänger av det trådlösa nätverket, ökar "
-"batterilivslängden)"
+"Extrem strömsparning (stänger av det trådlösa nätverket, allt för att öka "
+"tiden innan batteriet laddas ur)"
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr "Mjukvaruuppdatering"
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
@@ -303,230 +338,422 @@ msgstr ""
 "Mjukvaruuppdateringar rättar till fel, tar bort säkerhetsrisker och lägger "
 "till nya funktioner."
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr "Kontrollerar %s"
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr "Laddar ned %s..."
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr "Uppdaterar %s..."
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr "Den senaste versionen av mjukvaran är redan installerad"
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Det finns %s tillgänglig uppdatering"
 msgstr[1] "Det finns %s tillgängliga uppdateringar"
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr "Letar efter uppdateringar..."
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr "Installerar uppdateringar..."
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] "%s uppdatering installerades"
 msgstr[1] "%s uppdateringar installerades"
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr "Installera de valda objekten"
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr "Nedladdningsstorlek: %s"
 
-#: ../extensions/cpsection/updater/view.py:353
-#, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format, fuzzy
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "Frän version %(current)d till %(new)s (Storlek: %(size)s)"
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr "Inget"
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr "1 kb"
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr "%.0f kb"
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Mitt batteri"
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr "Borttaget"
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Laddar"
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "Batteriet är nästan slut"
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d återstår"
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "Fulladdad"
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr "IP-adress: %s"
 
-#: ../extensions/deviceicon/network.py:110
-msgid "Disconnect..."
-msgstr "Avbryt anslutning..."
-
-#: ../extensions/deviceicon/network.py:114
-msgid "Create new wireless network"
-msgstr "Skapa ett nytt trådlöst nätverk"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Avbryt anslutning"
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:264
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr "Kopplar upp..."
 
 # TODO: show the channel number
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:270
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr "Trådbundet nätverk"
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Anslut"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Inte ansluten"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%s's network %s"
-msgstr "%ss nätverk %s"
+msgid "Error: %s"
+msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format, fuzzy
+msgid "%d KB"
+msgstr "%dKB"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+# only temporarily
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Meshnätverk"
+
+# only temporarily
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "Meshnätverk"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "Mina högtalare"
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "Slå på ljud"
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Stäng av ljud"
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../extensions/globalkey/screenshot.py:58
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Grupp"
 
-#: ../extensions/globalkey/screenshot.py:60
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Hem"
 
-#: ../extensions/globalkey/screenshot.py:66
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr "\"%s\"-Skärmbild"
 
 #: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr "URL för säkerhetskopiering"
 
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
 # Error in original string! Never heard of "rbg colors".
-#: ../data/sugar.schemas.in.h:2
+#: ../data/sugar.schemas.in.h:5
+#, fuzzy
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 "Den färg som används för XO-ikonen överallt på skrivbordet. Det skall vara "
 "en sträng som består av streckfärg och fyllnadsfärg båda formaterade som "
 "rgb-färger. Exempel: #AC32FF,#9A5200"
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr "Hörnfördröjning"
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr "Fördröjning innan aktivering av ramen med hjälp av hörnen."
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr "Fördröjning innan aktivering av ramen med hjälp av kanterna."
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr "Kantfördröjning"
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr "Utseende på favoriter"
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr "Fortsättningsläge för favoriter"
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+#, fuzzy
+msgid "Font face that is used throughout the desktop."
+msgstr "Det användarnamn som används överallt på skrivbordet."
+
+#: ../data/sugar.schemas.in.h:17
+#, fuzzy
+msgid "Font size that is used throughout the desktop."
+msgstr "Det användarnamn som används överallt på skrivbordet."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
@@ -534,110 +761,135 @@ msgstr ""
 "Om SANT, så gör Sugar så att vi kan sökas fram av andra användare av jabber-"
 "servern."
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "Om SANT, så kommer Sugar att visa ett utloggningsalternativ."
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:32
+#, fuzzy
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr "Om SANT, så kommer Sugar att visa ett utloggningsalternativ."
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr "Jabber-server"
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr "Tangentbordstyp"
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr "Tangentbordstyp"
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr "Tangentbordsalternativ"
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr "Hur favoritvyn ser ut."
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 "Lista över tangentbordslayouter. Varje post bör vara i formen "
 "layout(variant)"
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr "Lista över Tangentbordsval."
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr "Automatisk ström"
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr "Automatisk ström."
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr "Extrem ström"
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr "Extrem ström."
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr "Publicera till Gadget"
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr "Inställningar för att stänga av ljudenheten."
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr "Visa utloggning"
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr "Ljud avstängt"
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr "Tangentbordstyp som kommer att användas:"
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr "Systemets tidszonsinställning."
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr "URL för den jabber-server som skall användas."
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr "URL för den plats där säkerhetskopieringar skall lagras."
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr "Användarfärg"
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr "Användarnamn"
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr "Det användarnamn som används överallt på skrivbordet."
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr "Volymnivå"
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr "Ljudenhetens volymnivå."
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -668,7 +920,7 @@ msgstr "sugar-control-panel: %s"
 # which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -692,72 +944,52 @@ msgstr ""
 "    -c nyckel    Rensar nuvarande värde på nyckel \n"
 "    "
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "För att förändringarna ska träda i kraft behöver du starta om Socker.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Varning"
 
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Ändringarna kräver omstart"
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Ångra ändringar"
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Senare"
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Starta om nu"
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr "Klar"
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/jarabe/desktop/activitieslist.py:80
-#: ../src/jarabe/journal/listview.py:147
-msgid "Title"
-msgstr "Rubrik"
-
-#: ../src/jarabe/desktop/activitieslist.py:91
-msgid "Version"
-msgstr "Version"
-
-#: ../src/jarabe/desktop/activitieslist.py:105
-#: ../src/jarabe/journal/listview.py:178
-msgid "Date"
-msgstr "Datum"
-
-#: ../src/jarabe/desktop/activitieslist.py:234
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../src/jarabe/desktop/activitieslist.py:355
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr "Bekräfta borttagning"
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Bekräfta borttagning: Vill du verkligen ta bort %s för alltid?"
@@ -766,391 +998,466 @@ msgstr "Bekräfta borttagning: Vill du verkligen ta bort %s för alltid?"
 # TODO: Implement stopping downloads
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
-#: ../src/jarabe/desktop/activitieslist.py:361
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr "Spara"
 
-#: ../src/jarabe/desktop/activitieslist.py:364
-#: ../src/jarabe/desktop/activitieslist.py:407
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Ta bort"
 
-#: ../src/jarabe/desktop/activitieslist.py:428
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr "Ta bort från favoriter"
 
-#: ../src/jarabe/desktop/activitieslist.py:432
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr "Lägg till till favoriter"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr "Frihand"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr "Ring"
 
 # TRANS: label for the spiral layout in the favorites view
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:337
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr "Spiral"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:404
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr "Låda"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:445
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr "Triangel"
 
-#: ../src/jarabe/desktop/favoritesview.py:323
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr "Registreringen lyckades"
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr "Du är nu registread hos din skolserver"
 
-#: ../src/jarabe/desktop/favoritesview.py:671
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr "Registrera"
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr "Mjukvaruuppdatering"
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 "Uppdatera dina aktiviteter så att du är säker på att de fungerar ihop med "
 "din nya mjukvara"
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr "Kontrollera nu"
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr "Listvy"
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr "<Ctrl> + 2"
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr "Favoritvy"
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl> + 1"
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr "Huvudtyp:"
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr "Verifieringstyp:"
 
 # Uncertain whether Personal here refers to both protocols or WPA2 only.
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr "Trådlös säkerhet:"
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
-msgstr "Anslut"
-
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
-msgstr "Avbryt anslutning"
-
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:466
-#: ../src/jarabe/frame/activitiestray.py:761
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Återuppta"
 
-#: ../src/jarabe/desktop/meshbox.py:471
-#: ../src/jarabe/frame/activitiestray.py:235
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr "Gå med i"
 
-#: ../src/jarabe/desktop/schoolserver.py:103
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+# only temporarily
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Meshnätverk"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr "Kunde inte komma åter servern."
 
-#: ../src/jarabe/desktop/schoolserver.py:108
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr "Servern misslyckades med att fullfölja förfrågan."
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr "Avstå"
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr "%dMB"
 
 # This really needs a TRANS!
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr "%s av %s"
 
-#: ../src/jarabe/frame/activitiestray.py:683
-#, python-format
-msgid "Transfer from %r"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format, fuzzy
+msgid "Transfer from %s"
 msgstr "Överföring från %r"
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr "Godta"
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr "Avvisa"
 
-#: ../src/jarabe/frame/activitiestray.py:810
-#, python-format
-msgid "Transfer to %r"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format, fuzzy
+msgid "Transfer to %s"
 msgstr "Överföring till %r"
 
-#: ../src/jarabe/frame/clipboardmenu.py:52 ../src/jarabe/view/palettes.py:218
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr "Öppna"
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr "Öppna med"
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr "%s urklipp"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr "Grannar"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr "F1"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr "F2"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr "F3"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr "F4"
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "Namn:"
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr "Klicka för att ändra färg:"
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr "Tillbaka"
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "Nästa"
 
-#: ../src/jarabe/journal/expandedentry.py:164
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr "Ingen titel"
 
-#: ../src/jarabe/journal/expandedentry.py:210
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr "Ingen förhandsvisning"
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr "Typ: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/jarabe/journal/expandedentry.py:230
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr "Datum: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:231
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr "Inget datum"
 
-#: ../src/jarabe/journal/expandedentry.py:260
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr "Medverkande:"
 
-#: ../src/jarabe/journal/expandedentry.py:283
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../src/jarabe/journal/expandedentry.py:309
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr "Nyckelord:"
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Dagbok"
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr "Sök"
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr "När som helst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr "Idag"
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr "Sedan igår"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr "Förra veckan"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr "Senaste månaden"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr "Senaste året"
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr "Vem som helst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr "Mina vänner"
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr "Mina klasskompisar"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr "Vad som helst"
 
-# TODO: Add "Start with" menu item
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
-msgstr "Kopiera"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Starta"
 
-#: ../src/jarabe/journal/listview.py:361
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "Din dagbok är tom."
 
-#: ../src/jarabe/journal/listview.py:363
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr "Kunde inte hitta matchande data"
 
 # Uncertain if this is used to clear the search criteria or the search results. A TRANS would be nice.
-#: ../src/jarabe/journal/listview.py:374
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr "Rensa sökning"
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "Din dagbok är full"
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr "Ta bort gamla dagboksinlägg för att få plats med nya."
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "Visa Dagbok"
 
@@ -1159,110 +1466,352 @@ msgid "Choose an object"
 msgstr "Välj ett objekt"
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr "Återuppta med"
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr "Börja med"
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr "Ingen aktivitet att börja med"
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr "Skicka till"
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr "Se detaljer"
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr "Inga kompisar närvarande"
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr "Ingen giltig anslutning hittad"
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr "Ingen aktivitet att fortsätta med"
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
-msgstr "Ingen aktivitet att börja med"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+#, fuzzy
+msgid "Documents"
+msgstr "Dokument"
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB ledigt"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr "Ta bort kompis"
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr "Bli kompis med"
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "Stäng av"
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Starta om"
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr "Logga ut"
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr "Mina inställningar"
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr "Bjud in till %s"
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "Startar..."
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr "Se källa"
 
-#: ../src/jarabe/view/palettes.py:82
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Avsluta"
 
-#: ../src/jarabe/view/palettes.py:122
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr "Öppna ny"
 
-#: ../src/jarabe/view/palettes.py:171
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "Visa innehåll"
 
-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB ledigt"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Ta bort"
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr "Instanskälla"
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr "Källa för aktivitetspaket"
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr "Se källa: %r"
 
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid ""
+#~ "Extreme power management (disableswireless radio, increases battery life)"
+#~ msgstr ""
+#~ "Extrem strömhantering (stänger av det trådlösa nätverket, ökar "
+#~ "batterilivslängden)"
+
+#~ msgid "Disconnect..."
+#~ msgstr "Avbryt anslutning..."
+
+#~ msgid "Create new wireless network"
+#~ msgstr "Skapa ett nytt trådlöst nätverk"
+
+#, python-format
+#~ msgid "%s's network %s"
+#~ msgstr "%ss nätverk %s"
+
+#~ msgid "Title"
+#~ msgstr "Rubrik"
+
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+# TODO: Add "Start with" menu item
+#~ msgid "Copy"
+#~ msgstr "Kopiera"
+
 #~ msgid "Cannot obtain data needed for registration."
 #~ msgstr ""
 #~ "Kunde inte komma åt den data som krävs för att genomföra registreringen."
@@ -1270,18 +1819,12 @@ msgstr "Se källa: %r"
 #~ msgid "Unmount"
 #~ msgstr "Avmontera"
 
-#~ msgid "Restart"
-#~ msgstr "Starta om"
-
 #~ msgid ""
 #~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 #~ msgstr ""
 #~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; och andra "
 #~ "bidragare."
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
 #~ msgid "Resume by default"
 #~ msgstr "Återuppta som förval"
 
@@ -1291,13 +1834,6 @@ msgstr "Se källa: %r"
 #~ msgid "Disconnecting..."
 #~ msgstr "Kopplar ned..."
 
-# only temporarily
-#~ msgid "Mesh Network"
-#~ msgstr "Meshnätverk"
-
-#~ msgid "Disconnected"
-#~ msgstr "Inte ansluten"
-
 #~ msgid "About my XO"
 #~ msgstr "Om min XO"
 
@@ -1329,11 +1865,5 @@ msgstr "Se källa: %r"
 #~ msgid "Clipboard object: %s."
 #~ msgstr "Kopieringsminne: %s."
 
-#~ msgid ""
-#~ "Extreme power management (disables wireless radio, increases battery life)"
-#~ msgstr ""
-#~ "Extrem strömsparning (stänger av det trådlösa nätverket, allt för att öka "
-#~ "tiden innan batteriet laddas ur)"
-
 #~ msgid "Control Panel"
 #~ msgstr "Kontrollpanel"
diff --git a/po/te.po b/po/te.po
index b52f7fe..9b88e94 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-23 07:44-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-07-24 12:16-0400\n"
 "Last-Translator: Sayamindu Dasgupta <sayamindu@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,135 +15,431 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65
-#: ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "పేరు"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "నాగురించి"
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "మీరు పేరు నింపవలెను"
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "కుంచె:   color=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "కుంచె:   %s"
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "నింపు:     color=%s hue=%s"
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "నింపు:     %s"
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "నిర్ధేశించి చెప్పిన రంగులు మార్చడంలో పొరబాటు జరిగింది"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "నిర్ధేశించి చెప్పిన రంగులలో పొరబాటు జరిగింది"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+#, fuzzy
+msgid "Click to change your color:"
 msgstr "రంగు మార్చడానికి నొక్కు"
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "వెనుకకు"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
 
-#: ../src/intro/intro.py:159
-#: ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "పూర్తి అయినది"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "అలభ్యం"
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "తర్వాత"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "స్నేహం తీసివేయి"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "ఉనికి"
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "స్నేహం చేయి"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "వరుస సంఖ్య:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "సాఫ్ట్​వేర్"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "బిల్డ్:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "ఫర్మ్​వేర్:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "తేదీ & కాలము"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "పొరబాటు. కాలమండలమే లేదు."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "కాలమానం"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "ఫ్రేమ్"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+#, fuzzy
+msgid "Value must be an integer."
+msgstr "అంకెలు ఉపయోగించండి"
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "ఎప్పుడూకాదు"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "వెంటనే"
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
-msgstr "%s కు పిలువు"
+msgid "%s seconds"
+msgstr "%s సెకనులు"
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "తీసివేయి"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "మొదలుపెట్టడంలో ఆలస్యమైంది"
 
-#: ../src/view/clipboardmenu.py:53
-#: ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "తెరువు"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "మూల"
 
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-# TODO: Implement stopping downloads
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
-# self.append_menu_item(self._stop_item)
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-#: ../src/view/home/HomeBox.py:86
-msgid "Keep"
-msgstr "ఉంచు"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "అంచు"
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
-msgstr "తో తెరువు"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "భాష"
 
-#: ../src/view/clipboardmenu.py:216
+#: ../extensions/cpsection/language/model.py:30
+#, fuzzy
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "%s ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "క్లిప్ బోర్డు వస్తువు : %s."
+msgid "Language for code=%s could not be determined."
+msgstr "కోడ్=%s కు భాష తెలియ లేదు."
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "తాళం రకము:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "మన్నించాలి నేను '%s'మాట్లాడలేను"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "దృడపరచుకొనే రకము:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "గుప్త్తీకరించే రకము:"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/Shell.py:240
-msgid "Screenshot"
-msgstr "తెరముద్ర"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
-msgid "Confirm erase"
-msgstr "చెరిపివేయుట నిర్ద్దారణ చేయి"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:82
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "వల"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "ఉనికి తెలియదు"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "రేడియొ నిర్దేసించడంలో పొరబాటు. ఉంది/లేదు వాడనా ."
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "రేడియొ నిర్దేసించడంలో పొరబాటు. ఉంది/లేదు వాడనా ."
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "నిస్తం​త్రి"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+#, fuzzy
+msgid "Radio"
+msgstr "రేడియే"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "శెర్వరు:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "విద్యుత్తు "
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "దానంతట అదేజరిగే విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "అమోఘమైన విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "విద్యుత్తు నిర్వహణ"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "దానంతట అదే విద్యుత్తు నిర్వహణ(బేటరీ ఆయువు పెంచుతుంది)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+"అమోఘమైన విద్యుత్తు నిర్వహణ( నిస్తం​త్రిని ఆపుతుంది, బేటరీ ఆయువు పెంచుతుంది)"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "చెరిపివేయుట నిర్ద్దారణ చేయుట:  %s శాశ్వతంగా చెరిపివేయబడుట ఇష్టమేనా?"
+msgid "Checking %s..."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:89
-#: ../src/view/palettes.py:120
-msgid "Erase"
-msgstr "చెరిపివేయి"
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:215
-msgid "List view"
-msgstr "వరసగా చూడు"
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:216
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
 #, fuzzy
-msgid "<Ctrl>2"
-msgstr "<Ctrl>L"
+msgid "None"
+msgstr "పూర్తి అయినది"
 
-#: ../src/view/home/HomeBox.py:273
-msgid "Favorites view"
-msgstr "ఇష్టమైనవి చూచుటకు"
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:274
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "నా బేటరీ"
+
+#: ../extensions/deviceicon/battery.py:147
 #, fuzzy
-msgid "<Ctrl>1"
-msgstr "<Ctrl>L"
+msgid "Removed"
+msgstr "తీసివేయి"
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:282
-msgid "Freeform"
-msgstr "కలగలుపుగా"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "చార్జి అవుతుంది"
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:289
-msgid "Ring"
-msgstr "వ్రుత్తము"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "చాలా తక్కువ చార్జీ మిగిలిఉంది"
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "తగిలించు"
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d మిగిలిఉంది"
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "చార్జీ అయింది"
 
-#: ../src/view/home/MeshBox.py:106
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
 #, fuzzy
 msgid "Disconnect"
 msgstr "వేరుచేయబడింది"
@@ -152,110 +448,436 @@ 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:118
-#, fuzzy
-msgid "Disconnecting..."
-msgstr "వేరుచేయి . . ."
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 #, fuzzy
 msgid "Connecting..."
 msgstr "వేరుచేయి . . ."
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr "తగిలించబడినది"
 
-#: ../src/view/home/MeshBox.py:211
-#: ../src/view/devices/network/mesh.py:41
-#: ../src/view/devices/network/mesh.py:68
-#: ../src/view/devices/network/mesh.py:72
-msgid "Mesh Network"
-msgstr "మెష్ వల"
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "వేరుచేయి . . ."
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "ప్రసారమార్గం"
 
-#: ../src/view/home/MeshBox.py:302
-#: ../src/view/palettes.py:61
-msgid "Resume"
-msgstr "పునరారంభించు"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:307
-#: ../src/view/frame/activitiestray.py:205
-msgid "Join"
-msgstr "కలువు"
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
 
-#: ../src/view/devices/battery.py:45
-msgid "My Battery"
-msgstr "నా బేటరీ"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
 
-#: ../src/view/devices/battery.py:114
-msgid "Charging"
-msgstr "చార్జి అవుతుంది"
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
 
-#: ../src/view/devices/battery.py:117
-msgid "Very little power remaining"
-msgstr "చాలా తక్కువ చార్జీ మిగిలిఉంది"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "తగిలించు"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "వేరుచేయబడింది"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "రద్దు చేయి"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr "%(hour)d:%(min).2d మిగిలిఉంది"
+msgid "Error: %s"
+msgstr ""
 
-#: ../src/view/devices/battery.py:127
-msgid "Charged"
-msgstr "చార్జీ అయింది"
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "మెష్ వల"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "మెష్ వల"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "నా  స్పీకరులు"
 
-#: ../src/view/devices/speaker.py:119
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "పలికించు"
 
-#: ../src/view/devices/speaker.py:122
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "నిశ్శబ్దంగా ఉంచు"
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "వేరుచేయబడింది"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:137
-msgid "Channel"
-msgstr "ప్రసారమార్గం"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "చుట్టుపక్కలవారు"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "మెష్ వల "
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "గుంపు"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "ఇల్లు"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "వ్యాపకం"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "తెరముద్ర"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
@@ -264,17 +886,20 @@ msgstr ""
 "షుగర్-కంట్రోల్-పేనల్: గమనిక, అదేపేరుతో ఒకటికన్నా ఎక్కువ అవకాశాలు ఉన్నవి: %s "
 "module: %r"
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "షుగర్-కంట్రోల్-పేనల్: key=%s అవకాశం లేదు"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "షుగర్-కంట్రోల్-పేనల్:  %s"
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -284,331 +909,885 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr "షుగర్-కంట్రోల్-పేనల్:"
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "మీ మార్పులు పనిచేయడానికి సుగరును తిరిగి మొదలు పెట్టండి.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "రద్దు చేయి"
-
-#: ../src/controlpanel/toolbar.py:121
-#: ../src/view/home/favoritesview.py:294
-msgid "Ok"
-msgstr "సరి"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "గమనిక"
 
-#: ../src/controlpanel/sectionview.py:34
-#: ../src/controlpanel/gui.py:260
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "మార్పులు తిరిగి మొదలుపెట్తినతర్వాతే పనిచేస్తాయి"
 
-#: ../src/controlpanel/gui.py:259
-msgid "Warning"
-msgstr "గమనిక"
-
-#: ../src/controlpanel/gui.py:263
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "మార్పులు రద్దుచేయి"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "తరవాత"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "ఇప్పుడు మరలామొదలుపెట్టు"
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
-msgstr "మీరు పేరు నింపవలెను"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "పూర్తి అయినది"
 
-#: ../src/controlpanel/model/aboutme.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr "కుంచె:   color=%s hue=%s"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "సరి"
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   %s"
-msgstr "కుంచె:   %s"
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "చెరిపివేయుట నిర్ద్దారణ చేయి"
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr "నింపు:     color=%s hue=%s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "చెరిపివేయుట నిర్ద్దారణ చేయుట:  %s శాశ్వతంగా చెరిపివేయబడుట ఇష్టమేనా?"
 
-#: ../src/controlpanel/model/aboutme.py:76
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+# TODO: Implement stopping downloads
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
+# self.append_menu_item(self._stop_item)
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "ఉంచు"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "చెరిపివేయి"
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "ఇష్టమైనదానిని తొలగించు"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "ఇష్టమైనదానిగా తయారుచేయి"
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "కలగలుపుగా"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "వ్రుత్తము"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "రిజిస్టరుచేయడం విఫలమైంది"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     %s"
-msgstr "నింపు:     %s"
+msgid "%s"
+msgstr "%s"
 
-#: ../src/controlpanel/model/aboutme.py:87
-msgid "Error in specified color modifiers."
-msgstr "నిర్ధేశించి చెప్పిన రంగులు మార్చడంలో పొరబాటు జరిగింది"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "రిజిస్టరుచేయడం విజయవంతమైంది"
 
-#: ../src/controlpanel/model/aboutme.py:90
-msgid "Error in specified colors."
-msgstr "నిర్ధేశించి చెప్పిన రంగులలో పొరబాటు జరిగింది"
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "ఇప్పుడు మీరు బడి సెర్వరుతో రిజిస్టరుచేయబడిఉన్నారు"
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "అలభ్యం"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "దాఖలు చేయి"
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "పొరబాటు. కాలమండలమే లేదు."
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38
-#: ../src/controlpanel/model/frame.py:60
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "వరసగా చూడు"
+
+#: ../src/jarabe/desktop/homebox.py:198
 #, fuzzy
-msgid "Value must be an integer."
-msgstr "అంకెలు ఉపయోగించండి"
+msgid "<Ctrl>2"
+msgstr "<Ctrl>L"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "ఇష్టమైనవి చూచుటకు"
 
-#: ../src/controlpanel/model/language.py:28
+#: ../src/jarabe/desktop/homebox.py:254
 #, fuzzy
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "%s ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
+msgid "<Ctrl>1"
+msgstr "<Ctrl>L"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "తాళం రకము:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "దృడపరచుకొనే రకము:"
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "పునరారంభించు"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "కలువు"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "కోడ్=%s కు భాష తెలియ లేదు."
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "మెష్ వల"
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "నిరస్కరించు"
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "మన్నించాలి నేను '%s'మాట్లాడలేను"
+msgid "%dB"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-#, fuzzy
-msgid "You must enter a server."
-msgstr "మీరు పేరు నింపవలెను"
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "ఉనికి తెలియదు"
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "రేడియొ నిర్దేసించడంలో పొరబాటు. ఉంది/లేదు వాడనా ."
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
 
-#: ../src/controlpanel/model/power.py:57
-msgid "Error in automatic pm argument, use on/off."
-msgstr "దానంతట అదేజరిగే విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/power.py:86
-msgid "Error in extreme pm argument, use on/off."
-msgstr "అమోఘమైన విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
-msgstr "నాగురించి"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
+#: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
-msgid "Click to change your color:"
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "తీసివేయి"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "తెరువు"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "తో తెరువు"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "చుట్టుపక్కలవారు"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "పేరు"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr "రంగు మార్చడానికి నొక్కు"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
-msgstr "నా ఎక్స్ ఒ గురించి"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "వెనుకకు"
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
-msgstr "ఉనికి"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "తర్వాత"
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
-msgstr "వరుస సంఖ్య:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
-msgstr "సాఫ్ట్​వేర్"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
-msgstr "బిల్డ్:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
-msgstr "ఫర్మ్​వేర్:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "తేదీ & కాలము"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
-msgstr "కాలమానం"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "ఫ్రేమ్"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
-msgstr "ఎప్పుడూకాదు"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
-msgstr "వెంటనే"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
-msgstr "%s సెకనులు"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
-msgstr "మొదలుపెట్టడంలో ఆలస్యమైంది"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
-msgstr "మూల"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "మొదలుపెట్టు"
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
-msgstr "అంచు"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
-msgstr "భాష"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
-msgstr "వల"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
-msgstr "నిస్తం​త్రి"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
-msgstr "రేడియే"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
-msgstr "మెష్ వల "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
-msgstr "శెర్వరు:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:27
-msgid "Power"
-msgstr "విద్యుత్తు "
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:51
-msgid "Power management"
-msgstr "విద్యుత్తు నిర్వహణ"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:61
-msgid "Automatic power management (increases battery life)"
-msgstr "దానంతట అదే విద్యుత్తు నిర్వహణ(బేటరీ ఆయువు పెంచుతుంది)"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:89
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
-"అమోఘమైన విద్యుత్తు నిర్వహణ( నిస్తం​త్రిని ఆపుతుంది, బేటరీ ఆయువు పెంచుతుంది)"
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "బడి మెష్ పొర్టల్ తో జతచేయబడింది"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr "బడి మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "ఎక్స్ఒ మెష్ పొర్టల్ తో జతచేయబడింది"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "ఎక్స్ఒ మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "సరళమైన మెష్ తో జత కుదిరింది"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "సరళమైన మెష్ మొదలవుతుంది"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "తెలియని మెష్"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:210
-msgid "Decline"
-msgstr "నిరస్కరించు"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:285
-msgid "Registration Failed"
-msgstr "రిజిస్టరుచేయడం విఫలమైంది"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:286
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "%s"
-msgstr "%s"
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB ఖాళీ"
 
-#: ../src/view/home/favoritesview.py:288
-msgid "Registration Successful"
-msgstr "రిజిస్టరుచేయడం విజయవంతమైంది"
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:289
-msgid "You are now registered with your school server."
-msgstr "ఇప్పుడు మీరు బడి సెర్వరుతో రిజిస్టరుచేయబడిఉన్నారు"
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:405
-msgid "Control Panel"
-msgstr "కంట్రొల్ పేనల్"
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:416
-msgid "Restart"
-msgstr "తిరిగి మొదలుపెట్టు"
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:421
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "స్నేహం తీసివేయి"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "స్నేహం చేయి"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "ఫూర్తిగా ఆపు"
 
-#: ../src/view/home/favoritesview.py:427
-msgid "Register"
-msgstr "దాఖలు చేయి"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "తిరిగి మొదలుపెట్టు"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
 
-#: ../src/view/palettes.py:42
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "%s కు పిలువు"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "మొదలవుతుంది..."
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "ఆపు"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
 
-#: ../src/view/palettes.py:104
-msgid "Start"
-msgstr "మొదలుపెట్టు"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../src/view/palettes.py:132
-msgid "Remove favorite"
-msgstr "ఇష్టమైనదానిని తొలగించు"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "ఆపు"
 
-#: ../src/view/palettes.py:136
-msgid "Make favorite"
-msgstr "ఇష్టమైనదానిగా తయారుచేయి"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../src/view/palettes.py:185
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "విషయాలను చూపు"
 
-#: ../src/view/palettes.py:209
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "తీసివేయి"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB ఖాళీ"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "క్లిప్ బోర్డు వస్తువు : %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "గుప్త్తీకరించే రకము:"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#, fuzzy
+#~ msgid "Disconnecting..."
+#~ msgstr "వేరుచేయి . . ."
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr "వేరుచేయి . . ."
+
+#, fuzzy
+#~ msgid "You must enter a server."
+#~ msgstr "మీరు పేరు నింపవలెను"
+
+#~ msgid "About my XO"
+#~ msgstr "నా ఎక్స్ ఒ గురించి"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "బడి మెష్ పొర్టల్ తో జతచేయబడింది"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "బడి మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "ఎక్స్ఒ మెష్ పొర్టల్ తో జతచేయబడింది"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "ఎక్స్ఒ మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "సరళమైన మెష్ తో జత కుదిరింది"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "సరళమైన మెష్ మొదలవుతుంది"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "తెలియని మెష్"
+
+#~ msgid "Control Panel"
+#~ msgstr "కంట్రొల్ పేనల్"
 
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
diff --git a/po/templates.po b/po/templates.po
new file mode 100644
index 0000000..8151467
--- /dev/null
+++ b/po/templates.po
@@ -0,0 +1,1713 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format
+msgid "%s seconds"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr ""
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "Activity"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr ""
+
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/th.po b/po/th.po
index a79e711..b0faf7d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,405 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d months"
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d week"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d weeks"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d day"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d days"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d hour"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hours"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d minute"
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minutes"
+msgid "%s clipping"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d second"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d seconds"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/tpi.po b/po/tpi.po
index e184567..7fd0d5d 100644
--- a/po/tpi.po
+++ b/po/tpi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,221 +16,874 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/intro.py:145
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/intro.py:162
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:212
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/view/Shell.py:262
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:147
-msgid "List view"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:148
-msgid "<Ctrl>L"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:204
-msgid "Favorites view"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:205
-msgid "<Ctrl>R"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
 msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:211
-msgid "Freeform"
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:218
-msgid "Ring"
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:152
-msgid "Connecting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:38
-#: ../src/view/devices/network/mesh.py:65
-#: ../src/view/devices/network/mesh.py:69
-msgid "Mesh Network"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
-#: ../src/view/devices/network/mesh.py:86
-msgid "Disconnect..."
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
-msgid "Join"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:42
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:111
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:120
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:124
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:40
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:104
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:107
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:64
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:134
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -240,278 +893,821 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
-msgid "Changes require restart"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:249
-msgid "Warning"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:253
-msgid "Cancel changes"
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:257
-msgid "Later"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:261
-msgid "Restart now"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:67
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "stroke:   color=%s hue=%s"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:70
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "stroke:   %s"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "fill:     color=%s hue=%s"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "fill:     %s"
+msgid "%dB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:85
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:88
-msgid "Error in specified colors."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
 msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
 msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
 msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "%s clipping"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
 msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:108
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:110
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:115
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:120
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:127
-msgid "Unknown Mesh"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:224
-msgid "Decline"
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:351
-msgid "Control Panel"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:362
-msgid "Restart"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:367
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:373
-msgid "Register"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../src/view/palettes.py:41
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/view/palettes.py:71
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/view/palettes.py:96
-msgid "Start"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/view/palettes.py:119
-msgid "Remove favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../src/view/palettes.py:123
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/view/palettes.py:169
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/view/palettes.py:193
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 696a3c0..54bca11 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-09-26 09:38-0400\n"
 "Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,247 +15,868 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
-msgstr "İsim:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Benim Hakkımda"
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
-msgstr "Renk değiştirmek için tıkla:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "Bir isim girmeniz gerekiyor"
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
-msgstr "Geri"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "fırça darbesi:_  renk=%s renk=%s"
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Kapat"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "fırça darbesi:_  %s"
 
-#: ../src/intro/window.py:192
-msgid "Next"
-msgstr "İleri"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "doldurma:_    renk=%s renk=%s"
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
-msgstr "Arkadaşı Kaldır"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "doldurma:_    %s"
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
-msgstr "Arkadaş Ekle"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "Belirtilen renk değiştiricilerinde hata"
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "Belirtilen renklerde hata"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "Renk değiştirmek için tıklayınız:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "Mevcut değil"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "Davet et %s"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
-msgstr "Kaldır"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "Kimlik"
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
-msgstr "Aç"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "Seri Numarası:"
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
-msgstr "Kaydet"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Yazılım"
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
-msgstr "Birlikte Aç"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "Yapı:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "Aygıt Yazılımı:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "Telif Hakkı ve Lisans"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+"Sugar gördüğünüz grafiksel kullanıcı arayüzüdür. Sugar, GNU General Public "
+"Lisansı'na sahip, ücretsiz bir yazılımdır. İstediğiniz takdirde yazılımı "
+"değiştirebilir ve/veya burada açıklanan belli koşullar altında kopyasını "
+"dağıtabilirsiniz."
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "Tam Lisans:"
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Tarih ve Zaman"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "Hatalı zaman dilimi yok"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "Saat Dilimi"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Çerçeve"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "Değer bir tamsayı olmalı"
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "asla"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "anlık"
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
-msgstr "%s Kırp"
+msgid "%s seconds"
+msgstr "%s saniyeler"
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Tuş Çeşidi:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "Aktivasyon Gecikmesi"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Kimlik Denetleme Çeşidi:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "Köşe"
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Şifreleme Çeşidi:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "Kenar"
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
-msgstr "Kayıt İçin Gerekli Bilgileri Sağlayamıyor"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
-msgstr "Sunucuya Bağlanamıyor"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
-msgstr "Sunucu İsteği Tamamlayamıyor"
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
-msgstr "Ekran Resmi"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
-msgstr "Silmeyi Onayla"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "Dil"
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "~/.i18n e girilemiyor. Standart ayarları oluşturunuz"
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "Silme Onayı: %s i tamamen silmek mi istiyorsunuz?"
+msgid "Language for code=%s could not be determined."
+msgstr "kod=%s için dil tanımlanamadı"
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
-msgstr "Silme"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Üzgünüm, %s konuşmuyorum"
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
-msgstr "Yazılım Güncelleme"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr "Aktivitelerinizi yeni yazılıma uygun hale getirmek için güncelleyiniz"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "İptal"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
-msgstr "Daha Sonra"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
-msgstr "Şimdi Kontrol Et"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
-msgstr "Liste Görünümü"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
-msgstr "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
-msgstr "Favoriler Görünümü"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
-msgstr "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Bağlan"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "Ağ"
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Bağlantıyı kes"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "Durum bilinmiyor"
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:118
-msgid "Disconnecting..."
-msgstr "Bağlantı kesiliyor..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "Belirtilen bağlantı noktasında hata vardır, açma kapama yapınız"
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
-msgstr "Bağlanıyor..."
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "Belirtilen bağlantı noktasında hata vardır, açma kapama yapınız"
 
-# TODO: show the channel number
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
-msgstr "Bağlı"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "Kablosuz Bağlantı"
 
-#: ../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"
-msgstr "Mesh Ağı"
+#: ../extensions/cpsection/network/view.py:69
+#, fuzzy
+msgid "Turn off the wireless radio to save battery life"
+msgstr "Pil ömrünü arttırmak için kablosuz bağlantı özelliğini kapatınız."
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "Bağlantıyı kes..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "Bağlantı "
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
-msgstr "Devam Et"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "Ağa bağlanmada sorun yaşıyorsanız ağ geçmişini silebilirsiniz."
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
-msgstr "Katıl"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr "Ağ geçmişini siliniz."
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "Sunucu:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Güç"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "Otomatik pm değişkeninde hata vardır, açma kapama yapınız"
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "En uçtaki pm değişkeninde hata vardır, açma kapama yapınız"
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "Güç Kontrolü"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "Otomatik güç kontrolü (pil ömrünü uzatır)"
+
+#: ../extensions/cpsection/power/view.py:86
+#, fuzzy
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+"Aşırı güç kontrolü (kablosuz bağlantı özelliğini etkisiz kılar, şarj ömrünü "
+"uzatır)"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+#, fuzzy
+msgid "Software update"
+msgstr "Yazılım Güncelleme"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "Kapat"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Pil Durumu"
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "Kaldır"
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Şarj"
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "Çok az şarj kaldı"
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d kaldı"
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "Şarj edildi"
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "Bağlantıyı kes"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "Bağlanıyor..."
+
+# TODO: show the channel number
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "Bağlı"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "Bağlan"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "Bağlantı kesildi"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "İptal"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "Mesh Ağı"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "Mesh Ağı"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "Hoparlör"
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "Sesi açık"
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Sessiz"
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "Bağlantı kesildi"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
-msgstr "Kanal"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
-msgstr "Komşular"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "Mesh"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "Ana ekran"
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "Aktivite"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "Ekran Resmi"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
@@ -264,19 +885,19 @@ msgstr ""
 "sugar-kontrol-paneli: UYARI, aynı isimle birden fazla seçenek buldu: %s "
 "birim: %r"
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "sugar-kontrol-panel: anahtar=%s geçerli bir seçenek değil"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "sugar-kontrol-panel: %s"
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -299,499 +920,885 @@ msgstr ""
 "-s anahtarı  Bu anahtarın son değerini kur \n"
 "\t"
 
-#: ../src/controlpanel/cmd.py:48
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Değişikliklerinizin etkinleşmesi için bilgisayarı tekrar başlatmanız "
 "gerekiyor\n"
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
-msgstr "Tamam"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "Uyarı"
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Değişiklikler bilgisayarın tekrar başlatılmasını gerektiriyor"
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
-msgstr "Uyarı"
-
-#: ../src/controlpanel/gui.py:268
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "Değişiklikleri İptal Et"
 
-#: ../src/controlpanel/gui.py:277
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "Daha Sonra"
+
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "Şimdi Tekrar Başlat"
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
-msgstr "Bir isim girmeniz gerekiyor"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "Kapat"
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr "fırça darbesi:_  renk=%s renk=%s"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "Tamam"
 
-#: ../src/controlpanel/aboutme/model.py:72
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   %s"
-msgstr "fırça darbesi:_  %s"
+msgid "Version %s"
+msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr "doldurma:_    renk=%s renk=%s"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "Silmeyi Onayla"
 
-#: ../src/controlpanel/aboutme/model.py:76
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "fill:     %s"
-msgstr "doldurma:_    %s"
-
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
-msgstr "Belirtilen renk değiştiricilerinde hata"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Silme Onayı: %s i tamamen silmek mi istiyorsunuz?"
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
-msgstr "Belirtilen renklerde hata"
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "Kaydet"
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
-msgstr "Benim Hakkımda"
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "Silme"
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
-msgstr "Renk değiştirmek için tıklayınız:"
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "Favorilerimden kaldır"
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
-msgstr "Mevcut değil"
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "Favorilerime ekle"
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
-msgstr "Kimlik"
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "dağınık görünüm"
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
-msgstr "Seri Numarası:"
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "çember görünümü"
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
-msgstr "Yazılım"
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr "sarmal"
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
-msgstr "Yapı:"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr "kutu"
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
-msgstr "Sugar:"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr "üçgen"
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
-msgstr "Aygıt Yazılımı:"
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "Kayıt Başarısız"
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
-msgstr "Telif Hakkı ve Lisans"
+#: ../src/jarabe/desktop/favoritesview.py:339
+#, python-format
+msgid "%s"
+msgstr "%s"
 
-#: ../src/controlpanel/aboutxo/view.py:156
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; ve Destekçiler"
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "Kayıt Başarılı"
 
-#: ../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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-"Sugar gördüğünüz grafiksel kullanıcı arayüzüdür. Sugar, GNU General Public "
-"Lisansı'na sahip, ücretsiz bir yazılımdır. İstediğiniz takdirde yazılımı "
-"değiştirebilir ve/veya burada açıklanan belli koşullar altında kopyasını "
-"dağıtabilirsiniz."
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "Şu an okul sunucunuza kayıt oldunuz"
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
-msgstr "Tam Lisans:"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "Kaydol"
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
-msgstr "XO Bilgisayarım Hakkında"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
-msgstr "Hatalı zaman dilimi yok"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr "Yazılım Güncelleme"
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
-msgstr "Saat Dilimi"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr "Aktivitelerinizi yeni yazılıma uygun hale getirmek için güncelleyiniz"
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr "Tarih ve Zaman"
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "Şimdi Kontrol Et"
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
-msgstr "Değer bir tamsayı olmalı"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "Liste Görünümü"
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
-msgstr "asla"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
-msgstr "anlık"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "Favoriler Görünümü"
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
-msgstr "%s saniyeler"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
-msgstr "Aktivasyon Gecikmesi"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "Tuş Çeşidi:"
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
-msgstr "Köşe"
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "Kimlik Denetleme Çeşidi:"
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
-msgstr "Kenar"
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
-msgstr "Çerçeve"
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "~/.i18n e girilemiyor. Standart ayarları oluşturunuz"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "Devam Et"
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "kod=%s için dil tanımlanamadı"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "Katıl"
 
-#: ../src/controlpanel/language/model.py:131
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Üzgünüm, %s konuşmuyorum"
-
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
-msgstr "Dil"
-
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
-msgstr "Durum bilinmiyor"
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
-msgstr "Belirtilen bağlantı noktasında hata vardır, açma kapama yapınız"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "Mesh Ağı"
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
-msgstr "Ağ"
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "Sunucuya Bağlanamıyor"
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
-msgstr "Kablosuz Bağlantı"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "Sunucu İsteği Tamamlayamıyor"
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
-msgstr "Pil ömrünü arttırmak için kablosuz bağlantı özelliğini kapatınız."
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "Azalmak"
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
-msgstr "Bağlantı "
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr "Ağa bağlanmada sorun yaşıyorsanız ağ geçmişini silebilirsiniz."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
-msgstr "Ağ geçmişini siliniz."
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
-msgstr "Mesh"
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
-msgstr "Sunucu:"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
-msgstr "Otomatik pm değişkeninde hata vardır, açma kapama yapınız"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
-msgstr "En uçtaki pm değişkeninde hata vardır, açma kapama yapınız"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
-msgstr "Güç Kontrolü"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
-msgstr "Otomatik güç kontrolü (pil ömrünü uzatır)"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
-msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
 msgstr ""
-"Aşırı güç kontrolü (kablosuz bağlantı özelliğini etkisiz kılar, şarj ömrünü "
-"uzatır)"
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
-msgstr "Güç"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "Kaldır"
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "Okul Mesh Ağı Portalı'na bağlandı."
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "Aç"
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr "Okul Mesh Ağı Portalı arıyor..."
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "Birlikte Aç"
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "XO Mesh Ağı Portalı'na bağlandı."
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr "%s Kırp"
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "XO Mesh Ağ Portalı arıyor..."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "Komşular"
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "Sadece Mesh Ağına bağlandı."
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "Sadece Mesh Ağı başlatıyor."
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "Bilinmeyen Mesh Ağı"
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
-msgstr "Azalmak"
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
-msgid "Freeform"
-msgstr "dağınık görünüm"
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "İsim:"
 
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
-msgid "Ring"
-msgstr "çember görünümü"
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "Renk değiştirmek için tıkla:"
 
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
-msgid "Spiral"
-msgstr "sarmal"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Geri"
 
-#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
-msgid "Box"
-msgstr "kutu"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "İleri"
 
-#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
-msgid "Triangle"
-msgstr "üçgen"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "İsimsiz"
 
-#: ../src/view/home/favoritesview.py:295
-msgid "Registration Failed"
-msgstr "Kayıt Başarısız"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "Ön izleme yok"
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%s"
-msgstr "%s"
-
-#: ../src/view/home/favoritesview.py:298
-msgid "Registration Successful"
-msgstr "Kayıt Başarılı"
-
-#: ../src/view/home/favoritesview.py:299
-msgid "You are now registered with your school server."
-msgstr "Şu an okul sunucunuza kayıt oldunuz"
-
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
-msgstr "Yeniden Başlat"
-
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
-msgstr "Kapat"
+msgid "Kind: %s"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
-msgstr "Kaydol"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
-msgstr "Başlıyor..."
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "Durdur"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
-msgstr "Başlat"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "Tarih yok"
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
-msgstr "Favorilerimden kaldır"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "Katılımcılar:"
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
-msgstr "Favorilerime ekle"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "Tanım:"
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
-msgstr "İçeriklerini göster"
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "Etiketler:"
 
-#: ../src/view/palettes.py:215
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB boş"
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "Günlük"
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr "Arama"
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr "Herhangi bir zaman"
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr "Bugün"
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr "Dünden itibaren"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr "Geçen hafta"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr "Geçen ay"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr "Geçen yıl"
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr "Herhangi biri"
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr "Arkadaşlarım"
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr "Sınıfım"
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr "Herhangi bir şey"
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
-msgstr "Kopyala"
-
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
-msgstr "İsimsiz"
-
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
-msgstr "Günlük"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
-msgstr "Ön izleme yok"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
-msgstr "Katılımcılar:"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
-msgstr "Tanım:"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
-msgstr "Etiketler:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "Başlat"
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
-msgstr "Bir nesne seçiniz"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
-msgstr "Kapat"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
-msgstr "Bağlantıyı kaldır"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
-msgstr "Tarih yok"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../src/journal/listview.py:39
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "Günlüğünüz boş"
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+#, fuzzy
+msgid "No matching entries"
 msgstr "Eşleşen bir giriş yok_"
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "Günlüğünüz dolu"
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 "Yeni girişler yapabilmek için lütfen günlükteki eski kayıtlardan bir kısmını "
 "siliniz"
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "Günlüğü göster"
 
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "Bir nesne seçiniz"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "Kapat"
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB boş"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "Arkadaşı Kaldır"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "Arkadaş Ekle"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "Kapat"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Yeniden Başlat"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "Davet et %s"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "Başlıyor..."
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "Durdur"
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "İçeriklerini göster"
+
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "Kaldır"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Şifreleme Çeşidi:"
+
+#~ msgid "Cannot obtain data needed for registration."
+#~ msgstr "Kayıt İçin Gerekli Bilgileri Sağlayamıyor"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnecting..."
+#~ msgstr "Bağlantı kesiliyor..."
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr "Bağlantıyı kes..."
+
+#~ msgid ""
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+#~ msgstr ""
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; ve Destekçiler"
+
+#~ msgid "About my XO"
+#~ msgstr "XO Bilgisayarım Hakkında"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Okul Mesh Ağı Portalı'na bağlandı."
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Okul Mesh Ağı Portalı arıyor..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "XO Mesh Ağı Portalı'na bağlandı."
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "XO Mesh Ağ Portalı arıyor..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Sadece Mesh Ağına bağlandı."
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Sadece Mesh Ağı başlatıyor."
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Bilinmeyen Mesh Ağı"
+
+#~ msgid "Settings"
+#~ msgstr "Ayarlar"
+
+#~ msgid "Copy"
+#~ msgstr "Kopyala"
+
+#~ msgid "Unmount"
+#~ msgstr "Bağlantıyı kaldır"
+
 #~ msgid "Add to journal"
 #~ msgstr "Günlüğe ekleyiniz."
 
diff --git a/po/tvl.po b/po/tvl.po
index eccea53..aae81d7 100644
--- a/po/tvl.po
+++ b/po/tvl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 00:31-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,43 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -108,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -116,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -128,50 +129,50 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr ""
 
@@ -180,75 +181,109 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
@@ -256,363 +291,574 @@ msgstr ""
 msgid "Power"
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:353
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr ""
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr ""
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr ""
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:110
-msgid "Disconnect..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:114
-msgid "Create new wireless network"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:264
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:270
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
 #, python-format
-msgid "%s's network %s"
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:58
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:60
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:66
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -637,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -651,304 +897,315 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:236
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:359
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:363
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:366
-#: ../src/jarabe/desktop/activitieslist.py:409
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:430
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:434
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:337
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:404
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:445
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:673
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:466
-#: ../src/jarabe/frame/activitiestray.py:761
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:67
-msgid "Resume"
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:471
-#: ../src/jarabe/frame/activitiestray.py:235
-msgid "Join"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:103
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:108
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:810
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52 ../src/jarabe/view/palettes.py:221
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:152
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
@@ -962,6 +1219,8 @@ msgid "Kind: %s"
 msgstr ""
 
 #: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr ""
 
@@ -975,106 +1234,161 @@ msgstr ""
 msgid "Size: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:288 ../src/jarabe/journal/misc.py:89
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:295
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:318
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:343
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:352
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:354
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:365
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
@@ -1083,106 +1397,317 @@ msgid "Choose an object"
 msgstr ""
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:74
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:85
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:125
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:174
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:196 ../src/jarabe/view/palettes.py:246
-#, python-format
-msgid "%(free_space)d MB Free"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/tzo.po b/po/tzo.po
index afc8693..aae81d7 100644
--- a/po/tzo.po
+++ b/po/tzo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 00:31-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,43 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -108,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -116,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -128,50 +129,50 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr ""
 
@@ -180,75 +181,109 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
@@ -256,363 +291,574 @@ msgstr ""
 msgid "Power"
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../extensions/cpsection/updater/view.py:353
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr ""
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr ""
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr ""
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:110
-msgid "Disconnect..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:114
-msgid "Create new wireless network"
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:261
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:267
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
 #, python-format
-msgid "%s's network %s"
+msgid "Error: %s"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:58
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:60
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:66
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -637,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -651,448 +897,498 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:80
-#: ../src/jarabe/journal/listview.py:147
-msgid "Title"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:91
-msgid "Version"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:105
-#: ../src/jarabe/journal/listview.py:178
-msgid "Date"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:234
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:355
+#: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:361
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:364
-#: ../src/jarabe/desktop/activitieslist.py:406
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:427
+#: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr ""
 
-#: ../src/jarabe/desktop/activitieslist.py:431
+#: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:323
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:671
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:463
-#: ../src/jarabe/frame/activitiestray.py:761
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:468
-#: ../src/jarabe/frame/activitiestray.py:235
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:34
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:51
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:56
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:810
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:164
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:210
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:230
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:231
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:260
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:283
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:309
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:361
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:363
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:374
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
@@ -1101,110 +1397,317 @@ msgid "Choose an object"
 msgstr ""
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:220
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:82
+#: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:122
+#: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:171
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:218
-msgid "Unmount"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/ug.po b/po/ug.po
index a45bff2..7fd0d5d 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,43 +20,39 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
-msgid "Name:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
@@ -64,48 +60,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:26
+#: ../extensions/cpsection/aboutcomputer/model.py:42
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:59
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:68
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:90
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:99
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:114
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:130
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:145
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:168
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:176
-msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:183
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 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 "
@@ -113,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:195
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr ""
 
@@ -121,11 +117,11 @@ msgstr ""
 msgid "Date & Time"
 msgstr ""
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
@@ -133,104 +129,161 @@ msgstr ""
 msgid "Frame"
 msgstr ""
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
 #: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:32
+#: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:56
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:64
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:77
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:93
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:102
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:115
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:123
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
 
-#: ../extensions/cpsection/network/view.py:133
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
@@ -238,229 +291,574 @@ msgstr ""
 msgid "Power"
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:56
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:40
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
-msgid "Disconnect..."
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
 msgid "Connecting..."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:113
-#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
 msgid "Connected"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:141
+#: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:169
+#: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:46
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../extensions/deviceicon/speaker.py:131
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../extensions/globalkey/screenshot.py:50
-msgid "Screenshot"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "Group"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "Home"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:1
-msgid "Backup URL"
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -485,7 +883,7 @@ msgstr ""
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -499,481 +897,817 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:273
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
-msgid "Ok"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:114
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:196
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:69
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
-msgid "Erase"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:106
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:107
+#: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:116
+#: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:233
+#: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:234
+#: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:296
+#: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:297
+#: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:130
-msgid "Connect"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:134
-msgid "Disconnect"
-msgstr ""
-
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
-#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:18
-msgid "Cannot obtain data needed for registration."
+#: ../src/jarabe/desktop/networkviews.py:500
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "Transfer from %r"
+msgid "Transfer from %s"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "Transfer to %r"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:52
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:36
+#: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:38
-msgid "Group"
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
 msgstr ""
 
-#: ../src/jarabe/frame/zoomtoolbar.py:40
-msgid "Home"
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#: ../src/jarabe/journal/collapsedentry.py:243
-#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:205
+#: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:224
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:247
+#: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#: ../src/jarabe/journal/expandedentry.py:273
+#: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:65
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:124
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:141
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:271
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:40
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:41
-msgid "No matching entries "
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
 msgstr ""
 
-#: ../src/jarabe/journal/listview.py:369
+#: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#: ../src/jarabe/journal/misc.py:92
-msgid "No date"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#: ../src/jarabe/journal/palettes.py:202
-msgid "No activity to start entry"
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:81
-msgid "My Settings"
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:86
-msgid "Logout"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:91
-msgid "Restart"
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:96
-msgid "Shutdown"
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
 msgstr ""
 
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:73
-msgid "Stop"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:145
-msgid "Remove favorite"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:149
-msgid "Make favorite"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "View source: %r"
 msgstr ""
 
-#: ../src/jarabe/view/palettes.py:248
-msgid "Unmount"
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 1bc0263..68bcb36 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-23 07:44-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2008-08-05 23:34-0400\n"
 "Last-Translator: Huda Sarfraz <huda.sarfraz@nu.edu.pk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,252 +15,883 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
-msgid "Name:"
-msgstr "نام:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "ميرے بارے ميں"
 
-#: ../src/intro/intro.py:94
-msgid "Click to change color:"
-msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "آپ کو ضرور ايک نام دينا ہے"
 
-#: ../src/intro/intro.py:145
-msgid "Back"
-msgstr "واپس"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "سٹروک:   رنگ=%s ہيو=%s"
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "مکمل"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "سٹروک:   %s"
 
-#: ../src/intro/intro.py:162
-msgid "Next"
-msgstr "آگے"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "بھر ديں:     رنگ=%s ہيو=%s"
 
-#: ../src/view/BuddyMenu.py:58
-msgid "Remove friend"
-msgstr "دوست کو ہٹائيں"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "بھر ديں:     %s"
 
-#: ../src/view/BuddyMenu.py:61
-msgid "Make friend"
-msgstr "دوست بنائيں"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "اختصاص کردہ رنگ ترمیم کاروں میں نقص۔"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "اختصاص کردہ رنگوں میں نقص۔"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "دستیاب نہيں"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "%s کی دعوت دیں"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:48
-msgid "Remove"
-msgstr "ہٹائيں"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "پہچان"
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
-msgid "Open"
-msgstr "کھوليں"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "سيريل نمبر:"
 
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-# TODO: Implement stopping downloads
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
-# self.append_menu_item(self._stop_item)
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. 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:63 ../src/view/home/HomeBox.py:86
-msgid "Keep"
-msgstr "رکھيں"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "Software"
 
-#: ../src/view/clipboardmenu.py:84
-msgid "Open with"
-msgstr "اس کے ساتھہ کھولیں"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr "سسٹم:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "فرم ویئر"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
 
-#: ../src/view/clipboardmenu.py:216
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "تاريخ & وقت"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "نقص، ٹائیم زون موجود نہیں ہے۔"
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "ٹائم زون"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "فريم"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "انٹيجر ويليو ہونی چاھيے۔"
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "کبھی نہیں"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "اچانک"
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "کلپ بورڈ آبجیکٹ: %s."
+msgid "%s seconds"
+msgstr "%s سيکنڈ"
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "اصل قسم:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "ايکٹيويشن وقفہ"
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "اجاذت دينے کی قسم:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "کونہ"
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "خفیہ کاری قسم:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "کنارہ"
 
-#: ../src/view/Shell.py:240
-msgid "Screenshot"
-msgstr "سکرين شاٹ"
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
-msgid "Confirm erase"
-msgstr "مٹانا کنفرم کريں"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:82
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "زبان"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں."
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "مٹانا تصدیق کريں: کيا آپ مستقل طور پر اس کو مٹانا چاھتے ہيں %s؟"
+msgid "Language for code=%s could not be determined."
+msgstr "کوڈ=%s کی زبان تعین نہیں کی جا سکی۔"
 
-#: ../src/view/home/HomeBox.py:89 ../src/view/palettes.py:120
-msgid "Erase"
-msgstr "مٹائيں"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "معاف کيجيے ميں '%s' نہيں بولتا/بولتی۔"
 
-#: ../src/view/home/HomeBox.py:215
-msgid "List view"
-msgstr "فہرست نظارہ"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:216
-msgid "<Ctrl>2"
-msgstr "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:273
-msgid "Favorites view"
-msgstr "پسندیدگان نظارہ"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
 
-#: ../src/view/home/HomeBox.py:274
-msgid "<Ctrl>1"
-msgstr "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr ""
 
-# 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:282
-msgid "Freeform"
-msgstr "فری فارم"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+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:289
-msgid "Ring"
-msgstr "پليٹ"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "کنيکٹ"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "منقطع کریں"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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:118
-msgid "Disconnecting..."
-msgstr "رابطہ کٹ رہا ہے۔۔۔"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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
-msgid "Connecting..."
-msgstr "کنيکشن مل رہا ہے۔۔۔"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "نيٹ ورک"
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
-msgid "Connected"
-msgstr "کنيکشن ہو گيا ہے"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "نامعلوم حالت"
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:41
-#: ../src/view/devices/network/mesh.py:68
-#: ../src/view/devices/network/mesh.py:72
-msgid "Mesh Network"
-msgstr "ميش نيٹ ورک"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
 
-# Only show disconnect when there's a mesh device, because mesh takes
-# 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/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "کٹ کريں۔۔۔"
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
-msgid "Resume"
-msgstr "پھر شروع کريں"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "وائيرليس"
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:205
-msgid "Join"
-msgstr "شرکت کريں"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:82
+#, fuzzy
+msgid "Radio"
+msgstr "ریڈيو:"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "سکول سرور:"
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "پاور"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "خودکار pm برہان میں نقص، آن/آف استعمال کریں۔"
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "ایکسٹریم pm برہان میں نقص، آن/آف استعمال کریں۔"
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "پاور کنٹرول"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "آٹو ميٹک پاور کنٹرول(بیٹری کا دورانيہ ذيادہ کرنے کے ليے)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "مکمل"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "ميری بيٹری"
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
+msgstr "ہٹائيں"
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "چارج کر رہا ہے"
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "پاور بہت کم رہ گئی ہے"
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d رہ گئے ہيں"
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr "چارج ہو گئی ہے"
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "منقطع کریں"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "کنيکشن مل رہا ہے۔۔۔"
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "کنيکشن ہو گيا ہے"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "چينل"
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "کنيکٹ"
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "منقطع ہو گیا"
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "منسوخ کريں"
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr "ميش نيٹ ورک"
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "ميش نيٹ ورک"
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr "ميرے سپيکرز"
 
-#: ../src/view/devices/speaker.py:119
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr "ان ميوٹ"
 
-#: ../src/view/devices/speaker.py:122
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "ميوٹ"
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "منقطع ہو گیا"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
 
-#: ../src/view/devices/network/wireless.py:137
-msgid "Channel"
-msgstr "چينل"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:34
-msgid "Neighborhood"
-msgstr "ميرے پڑوسی"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "ميش"
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "گروپ"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "گھر"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "سرگرمی"
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "سکرين شاٹ"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr "شوگر-کنٹرول-پينل:ايک ہی نام کے ساتھہ کافی آپشن ملی ہيں: %s موڈيول: %r"
 
-#: ../src/controlpanel/cmd.py:28
+#: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr "شوگر-کنٹرول-پينل: کی=%s يہ آپشن موجود نہيں ہے"
 
-#: ../src/controlpanel/cmd.py:29
+#: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr "شوگر-کنٹرول-پينل:%s "
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -270,6 +901,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
@@ -282,320 +914,879 @@ msgstr ""
 "-s key set the current value for the key \n"
 "   "
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "نئی تبديلیاں عمل میں لانے کے لیے آپ کو شوگر پھر شروع کرنا ہو گا۔\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "منسوخ کريں"
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:294
-msgid "Ok"
-msgstr "ٹھیک ہے"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "وارننگ"
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:260
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "دوبارہ چلا کر تبديلياں عمل ميں لائيں"
 
-#: ../src/controlpanel/gui.py:259
-msgid "Warning"
-msgstr "وارننگ"
-
-#: ../src/controlpanel/gui.py:263
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "تبديلياں ختم کريں"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "بعد ميں"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "ابھی دوبارہ چلائيں"
 
-#: ../src/controlpanel/model/aboutme.py:44
-msgid "You must enter a name."
-msgstr "آپ کو ضرور ايک نام دينا ہے"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "مکمل"
 
-#: ../src/controlpanel/model/aboutme.py:69
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
+msgstr "ٹھیک ہے"
+
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr "سٹروک:   رنگ=%s ہيو=%s"
+msgid "Version %s"
+msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "مٹانا کنفرم کريں"
+
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "stroke:   %s"
-msgstr "سٹروک:   %s"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "مٹانا تصدیق کريں: کيا آپ مستقل طور پر اس کو مٹانا چاھتے ہيں %s؟"
+
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+# TODO: Implement stopping downloads
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
+# self.append_menu_item(self._stop_item)
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "رکھيں"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "مٹائيں"
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "پسنديدہ ختم کريں"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "پسندیدہ بنائيں"
+
+# TRANS: label for the freeform layout in the favorites view
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "فری فارم"
+
+# TRANS: label for the ring layout in the favorites view
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr "پليٹ"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "رجسٹريشن نہيں ہوئی"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr "بھر ديں:     رنگ=%s ہيو=%s"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "رجسٹريشن ہو گئی"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "اب آپ اپنے سکول سرور کے ساتھہ رجسٹرڈ ہيں۔"
 
-#: ../src/controlpanel/model/aboutme.py:76
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "رجسٹر کريں"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "فہرست نظارہ"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr "پسندیدگان نظارہ"
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "اصل قسم:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "اجاذت دينے کی قسم:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "پھر شروع کريں"
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "شرکت کريں"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "fill:     %s"
-msgstr "بھر ديں:     %s"
+msgid "Ad-hoc Network %d"
+msgstr ""
 
-#: ../src/controlpanel/model/aboutme.py:87
-msgid "Error in specified color modifiers."
-msgstr "اختصاص کردہ رنگ ترمیم کاروں میں نقص۔"
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "ميش نيٹ ورک"
 
-#: ../src/controlpanel/model/aboutme.py:90
-msgid "Error in specified colors."
-msgstr "اختصاص کردہ رنگوں میں نقص۔"
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "دستیاب نہيں"
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
 
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "نقص، ٹائیم زون موجود نہیں ہے۔"
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "منظور نہیں ہوا"
 
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
-msgstr "انٹيجر ويليو ہونی چاھيے۔"
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں."
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "کوڈ=%s کی زبان تعین نہیں کی جا سکی۔"
+msgid "%dMB"
+msgstr ""
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "معاف کيجيے ميں '%s' نہيں بولتا/بولتی۔"
+msgid "%s of %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "ايک سکول سرور ضرور لکھیں۔"
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "نامعلوم حالت"
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
 
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../src/controlpanel/model/power.py:57
-msgid "Error in automatic pm argument, use on/off."
-msgstr "خودکار pm برہان میں نقص، آن/آف استعمال کریں۔"
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
 
-#: ../src/controlpanel/model/power.py:86
-msgid "Error in extreme pm argument, use on/off."
-msgstr "ایکسٹریم pm برہان میں نقص، آن/آف استعمال کریں۔"
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:32
-msgid "About Me"
-msgstr "ميرے بارے ميں"
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutme.py:134
-msgid "Click to change your color:"
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "ہٹائيں"
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "کھوليں"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "اس کے ساتھہ کھولیں"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "ميرے پڑوسی"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "نام:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
 msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
-msgstr "ميرے XO کے بارے ميں"
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "واپس"
 
-#: ../src/controlpanel/view/aboutxo.py:47
-msgid "Identity"
-msgstr "پہچان"
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "آگے"
 
-#: ../src/controlpanel/view/aboutxo.py:56
-msgid "Serial Number:"
-msgstr "سيريل نمبر:"
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:79
-msgid "Software"
-msgstr "Software"
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:88
-msgid "Build:"
-msgstr "سسٹم:"
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/aboutxo.py:103
-msgid "Firmware:"
-msgstr "فرم ویئر"
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "تاريخ & وقت"
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/datetime.py:72
-msgid "Timezone"
-msgstr "ٹائم زون"
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "فريم"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:30
-msgid "never"
-msgstr "کبھی نہیں"
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:31
-msgid "instantaneous"
-msgstr "اچانک"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "%s seconds"
-msgstr "%s سيکنڈ"
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:56
-msgid "Activation Delay"
-msgstr "ايکٹيويشن وقفہ"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../src/controlpanel/view/frame.py:80
-msgid "Corner"
-msgstr "کونہ"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "شروع کريں"
 
-#: ../src/controlpanel/view/frame.py:115
-msgid "Edge"
-msgstr "کنارہ"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
-msgid "Language"
-msgstr "زبان"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:28
-msgid "Network"
-msgstr "نيٹ ورک"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:53
-msgid "Wireless"
-msgstr "وائيرليس"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
-msgstr "ریڈيو:"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:94
-msgid "Mesh"
-msgstr "ميش"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/network.py:103
-msgid "Server:"
-msgstr "سکول سرور:"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:27
-msgid "Power"
-msgstr "پاور"
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:51
-msgid "Power management"
-msgstr "پاور کنٹرول"
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:61
-msgid "Automatic power management (increases battery life)"
-msgstr "آٹو ميٹک پاور کنٹرول(بیٹری کا دورانيہ ذيادہ کرنے کے ليے)"
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../src/controlpanel/view/power.py:89
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "سکول کے ميش پورٹل کے ساتھہ ملا ہوا ہے"
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr " سکول ميش پورٹل ڈھونڈ رہا ہے ..."
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "‌XO ميش پورٹل کے ساتھہ جڑا ہوا ہے"
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "XO ميش پورٹل ڈھونڈ رہا ہے ..."
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "سادہ ميش کے ساتھ جڑا ہوا ہے"
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "سادہ ميش شروع کر رہا ہے"
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "نامعلوم ميش"
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
 
-#: ../src/view/frame/activitiestray.py:210
-msgid "Decline"
-msgstr "منظور نہیں ہوا"
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:285
-msgid "Registration Failed"
-msgstr "رجسٹريشن نہيں ہوئی"
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:286
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "%s"
-msgstr "%s"
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB dخالی"
 
-#: ../src/view/home/favoritesview.py:288
-msgid "Registration Successful"
-msgstr "رجسٹريشن ہو گئی"
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:289
-msgid "You are now registered with your school server."
-msgstr "اب آپ اپنے سکول سرور کے ساتھہ رجسٹرڈ ہيں۔"
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:405
-msgid "Control Panel"
-msgstr "کنٹرول پينل"
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:416
-msgid "Restart"
-msgstr "دوبارہ چلائيں"
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
 
-#: ../src/view/home/favoritesview.py:421
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "دوست کو ہٹائيں"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "دوست بنائيں"
+
+#: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr "بند کريں"
 
-#: ../src/view/home/favoritesview.py:427
-msgid "Register"
-msgstr "رجسٹر کريں"
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "دوبارہ چلائيں"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
 
-#: ../src/view/palettes.py:42
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr "%s کی دعوت دیں"
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "شروع ہو رہا ہے ..."
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "روکیں"
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
 
-#: ../src/view/palettes.py:104
-msgid "Start"
-msgstr "شروع کريں"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../src/view/palettes.py:132
-msgid "Remove favorite"
-msgstr "پسنديدہ ختم کريں"
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "روکیں"
 
-#: ../src/view/palettes.py:136
-msgid "Make favorite"
-msgstr "پسندیدہ بنائيں"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../src/view/palettes.py:185
+#: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr "مشمولات دکھائيں"
 
-#: ../src/view/palettes.py:209
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "ہٹائيں"
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB dخالی"
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "کلپ بورڈ آبجیکٹ: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "خفیہ کاری قسم:"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnecting..."
+#~ msgstr "رابطہ کٹ رہا ہے۔۔۔"
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# 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
+#~ msgid "Disconnect..."
+#~ msgstr "کٹ کريں۔۔۔"
+
+#~ msgid "You must enter a server."
+#~ msgstr "ايک سکول سرور ضرور لکھیں۔"
+
+#~ msgid "About my XO"
+#~ msgstr "ميرے XO کے بارے ميں"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "سکول کے ميش پورٹل کے ساتھہ ملا ہوا ہے"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr " سکول ميش پورٹل ڈھونڈ رہا ہے ..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "‌XO ميش پورٹل کے ساتھہ جڑا ہوا ہے"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "XO ميش پورٹل ڈھونڈ رہا ہے ..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "سادہ ميش کے ساتھ جڑا ہوا ہے"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "سادہ ميش شروع کر رہا ہے"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "نامعلوم ميش"
+
+#~ msgid "Control Panel"
+#~ msgstr "کنٹرول پينل"
 
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
diff --git a/po/wa.po b/po/wa.po
index 63d4e34..7fd0d5d 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,749 +16,1698 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
 msgstr ""
 
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
 msgstr ""
 
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
 msgstr ""
 
-#: ../src/intro/window.py:192
-msgid "Next"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../src/view/BuddyMenu.py:92
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
 msgstr ""
 
-#: ../src/view/clipboardmenu.py:228
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "%s clipping"
+msgid "%s seconds"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
 msgstr ""
 
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:80
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../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"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
 msgstr ""
 
-#: ../src/view/devices/battery.py:45
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#: ../src/view/devices/battery.py:114
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#: ../src/view/devices/battery.py:117
+#: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:123
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#: ../src/view/devices/battery.py:127
+#: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:44
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:125
+#: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#: ../src/view/devices/speaker.py:128
+#: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
 msgstr ""
 
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:39
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:41
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../src/view/frame/zoomtoolbar.py:43
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:26
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:1
 msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
 msgstr ""
 
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
 msgstr ""
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
 msgstr ""
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
 msgstr ""
 
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:44
-msgid "You must enter a name."
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:69
-#, python-format
-msgid "stroke:   color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:72
-#, python-format
-msgid "stroke:   %s"
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:74
-#, python-format
-msgid "fill:     color=%s hue=%s"
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:76
-#, python-format
-msgid "fill:     %s"
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:87
-msgid "Error in specified color modifiers."
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/aboutme/model.py:90
-msgid "Error in specified colors."
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
 msgstr ""
 
-#: ../src/controlpanel/aboutme/view.py:134
-msgid "Click to change your color:"
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/model.py:24
-msgid "Not available"
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:55
-msgid "Identity"
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:64
-msgid "Serial Number:"
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:87
-msgid "Software"
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:96
-msgid "Build:"
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:111
-msgid "Sugar:"
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:126
-msgid "Firmware:"
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:148
-msgid "Copyright and License"
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../data/sugar.schemas.in.h:30
 msgid ""
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
 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 "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/view.py:175
-msgid "Full license:"
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
 msgstr ""
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
 msgstr ""
 
-#: ../src/controlpanel/datetime/model.py:89
-msgid "Error timezone does not exist."
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
 msgstr ""
 
-#: ../src/controlpanel/datetime/view.py:68
-msgid "Timezone"
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
 msgstr ""
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
 msgstr ""
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
-msgid "Value must be an integer."
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:26
-msgid "never"
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:27
-msgid "instantaneous"
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:28
-#, python-format
-msgid "%s seconds"
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:52
-msgid "Activation Delay"
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:76
-msgid "Corner"
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
 msgstr ""
 
-#: ../src/controlpanel/frame/view.py:111
-msgid "Edge"
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
 msgstr ""
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
 msgstr ""
 
-#: ../src/controlpanel/language/model.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:62
-msgid "State is unknown."
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../src/controlpanel/network/model.py:82
-msgid "Error in specified radio argument use on/off."
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:54
-msgid "Wireless"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:75
-msgid "Radio"
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:91
-msgid "Discard network history if you have trouble connecting to the network"
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:100
-msgid "Discard network history"
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
 msgstr ""
 
-#: ../src/controlpanel/network/view.py:122
-msgid "Server:"
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:55
-msgid "Error in automatic pm argument, use on/off."
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
 msgstr ""
 
-#: ../src/controlpanel/power/model.py:84
-msgid "Error in extreme pm argument, use on/off."
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:47
-msgid "Power management"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:57
-msgid "Automatic power management (increases battery life)"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/power/view.py:85
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
-"Extreme power management (disableswireless radio, increases battery life)"
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
 msgstr ""
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
+msgid "Ok"
 msgstr ""
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
 msgstr ""
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
 msgstr ""
 
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
 msgstr ""
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
 msgstr ""
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
 msgstr ""
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
 msgstr ""
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
 msgstr ""
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr ""
+
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%(free_space)d MB Free"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
+#, python-format
+msgid "%dB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:525
+#, python-format
+msgid "%dKB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:527
+#, python-format
+msgid "%dMB"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:544
+#, python-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
+msgid "Transfer to %s"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
+#, python-format
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#, python-format
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:265
+#, python-format
+msgid "Date: %s"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:266
+#, python-format
+msgid "Size: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr ""
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
 msgid "Search"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Anytime"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Today"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:148
 msgid "Past year"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "Anyone"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:157
 msgid "My friends"
 msgstr ""
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My class"
 msgstr ""
 
-#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:300
 msgid "Anything"
 msgstr ""
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
-msgid "Copy"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
 msgstr ""
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:134
-msgid "Choose an object"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
 msgstr ""
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
 msgstr ""
 
-#: ../src/journal/volumestoolbar.py:93
-msgid "Unmount"
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
 msgstr ""
 
-#: ../src/journal/misc.py:95
-msgid "No date"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
 msgstr ""
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#: ../src/journal/modalalert.py:59
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-#: ../src/journal/modalalert.py:63
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#: ../src/journal/modalalert.py:75
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
+#, python-format
+msgid "Invite to %s"
+msgstr ""
+
+#: ../src/jarabe/view/launcher.py:145
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr ""
+
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
diff --git a/po/yo.po b/po/yo.po
index 5299db7..45f3600 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
 "PO-Revision-Date: 2006-07-07 09:48+0100\n"
 "Last-Translator: Fajuyitan, Sunday Ayo <ayo@wazobialinux.com>\n"
 "Language-Team: Yoruba\n"
@@ -16,433 +16,1716 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../shell/PresenceWindow.py:62
-msgid "Who's around:"
-msgstr "Ta ló wà níbẹ̀ o o:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr ""
 
-#: ../shell/PresenceWindow.py:104
-msgid "Share"
-msgstr "Ìpín"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr ""
 
-#: ../shell/StartPage.py:189
-msgid "Search"
-msgstr "Wádìí"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr ""
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "Padà Sẹ́yìn"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:23
-msgid "Forward"
-msgstr "Lọ síwájú"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr ""
 
-#: ../activities/browser/NavigationToolbar.py:29
-msgid "Reload"
-msgstr "Tun kì"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr ""
 
-#: ../shell/shell.py:333
-msgid "Everyone"
-msgstr "Gbogbo èèyàn"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr ""
 
-#: ../sugar/chat/ChatEditor.py:43
-msgid "Send"
-msgstr "Fi ránṣẹ́"
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr ""
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
 msgstr ""
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
 msgstr ""
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
 msgstr ""
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
+#: ../extensions/cpsection/aboutcomputer/model.py:171
+#, python-format
+msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
 msgstr ""
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr ""
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr ""
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr ""
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr ""
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
-msgid "Invite to %s"
+msgid "%s seconds"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr ""
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
 msgstr ""
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
 msgstr ""
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr ""
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
-msgid "Clipboard object: %s."
+msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
 msgstr ""
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
 msgstr ""
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
 msgstr ""
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
 msgstr ""
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
-msgid "Mesh Network"
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
 msgstr ""
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
+#: ../extensions/cpsection/network/model.py:140
+msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr ""
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr ""
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+msgid "None"
+msgstr ""
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr ""
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:147
+msgid "Removed"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:158
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr ""
+
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
 msgstr ""
 
-#: ../shell/view/devices/network/wireless.py:131
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
+msgid "Mesh Network"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:656
+#, python-format
+msgid "Mesh Network %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr ""
+
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr ""
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr ""
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:358
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr ""
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr ""
+
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr ""
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr ""
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
 msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d year"
+msgid "%s"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr ""
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d years"
+msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/networkviews.py:634
 #, python-format
-msgid "%d month"
+msgid "Mesh Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
+msgid "%dB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
+msgid "%dKB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
+msgid "%dMB"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
+msgid "%s of %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
+msgid "Transfer from %s"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
+msgid "%s (%s)"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
+msgid "Transfer to %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr ""
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
+msgid "%s clipping"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "Padà Sẹ́yìn"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
+msgid "Date: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
+msgid "Size: %s"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
 msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "Wádìí"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr ""
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
-msgid "Error copying timezone (from %s): %s"
+msgid "Error while copying the entry. %s"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
+
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Changing permission of timezone: %s"
+msgid "Older Version Of %s Activity"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr ""
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
+msgid "%(free_space)d MB Free"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
 msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
+msgid "Invite to %s"
 msgstr ""
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
+msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
 msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
+#: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
+msgid "Remove"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
 msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Who's around:"
+#~ msgstr "Ta ló wà níbẹ̀ o o:"
+
+#~ msgid "Share"
+#~ msgstr "Ìpín"
+
+#~ msgid "Forward"
+#~ msgstr "Lọ síwájú"
+
+#~ msgid "Reload"
+#~ msgstr "Tun kì"
+
+#~ msgid "Everyone"
+#~ msgstr "Gbogbo èèyàn"
+
+#~ msgid "Send"
+#~ msgstr "Fi ránṣẹ́"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd5b1b2..cead223 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,415 +6,1903 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-18 18:19+0000\n"
-"PO-Revision-Date: 2008-01-11 21:14+0000\n"
-"Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
+"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"PO-Revision-Date: 2011-10-10 08:16+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: ../shell/intro/intro.py:67
-msgid "Name:"
-msgstr "姓名:"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "关於我"
 
-#: ../shell/intro/intro.py:96
-msgid "Click to change color:"
-msgstr "点击来改变颜色:"
+#: ../extensions/cpsection/aboutme/model.py:48
+msgid "You must enter a name."
+msgstr "输入姓名"
 
-#: ../shell/intro/intro.py:146
-msgid "Back"
-msgstr "后退"
+#: ../extensions/cpsection/aboutme/model.py:75
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "画笔: 颜色=%s 色调=%s"
 
-#: ../shell/intro/intro.py:160
-msgid "Done"
-msgstr "完成"
+#: ../extensions/cpsection/aboutme/model.py:78
+#, python-format
+msgid "stroke:   %s"
+msgstr "画笔: %s"
 
-#: ../shell/intro/intro.py:163
-msgid "Next"
-msgstr "下一步"
+#: ../extensions/cpsection/aboutme/model.py:80
+#, python-format
+msgid "fill:     color=%s hue=%s"
+msgstr "填充: 颜色=%s 色调=%s"
 
-#: ../shell/view/BuddyMenu.py:59
-msgid "Remove friend"
-msgstr "删除好友"
+#: ../extensions/cpsection/aboutme/model.py:82
+#, python-format
+msgid "fill:     %s"
+msgstr "填充: %s"
 
-#: ../shell/view/BuddyMenu.py:62
-msgid "Make friend"
-msgstr "结交好友"
+#: ../extensions/cpsection/aboutme/model.py:94
+msgid "Error in specified color modifiers."
+msgstr "给定变化色时发生错误"
+
+#: ../extensions/cpsection/aboutme/model.py:97
+msgid "Error in specified colors."
+msgstr "给定颜色时发生错误"
+
+#: ../extensions/cpsection/aboutme/view.py:235
+msgid "Click to change your color:"
+msgstr "点击改变颜色:"
+
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "关於我的电脑"
 
-#: ../shell/view/BuddyMenu.py:84
+#: ../extensions/cpsection/aboutcomputer/model.py:42
+msgid "Not available"
+msgstr "不可用"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:171
 #, python-format
-msgid "Invite to %s"
-msgstr "邀请到%s"
+msgid "%(interface)s: %(version)s"
+msgstr ""
 
-#: ../shell/view/clipboardmenu.py:58
-msgid "Remove"
+#: ../extensions/cpsection/aboutcomputer/view.py:61
+msgid "Identity"
+msgstr "身份"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:70
+msgid "Serial Number:"
+msgstr "序号："
+
+#: ../extensions/cpsection/aboutcomputer/view.py:92
+msgid "Software"
+msgstr "软件"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:101
+msgid "Build:"
+msgstr ""
+
+#: ../extensions/cpsection/aboutcomputer/view.py:116
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:132
+msgid "Firmware:"
+msgstr "固件："
+
+#: ../extensions/cpsection/aboutcomputer/view.py:147
+msgid "Wireless Firmware:"
+msgstr "无线固件："
+
+#: ../extensions/cpsection/aboutcomputer/view.py:170
+msgid "Copyright and License"
+msgstr "版权及许可协议"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:188
+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 "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr "Sugar是你所看见的图型用户界面，Sugar是免费的软件，以GNU的通用公共许可证授权。欢迎您根据授权条例修改和/或发布本软件的副本"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:200
+msgid "Full license:"
+msgstr "完整的许可协议："
+
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "日期和时间"
+
+#: ../extensions/cpsection/datetime/model.py:92
+msgid "Error timezone does not exist."
+msgstr "错误, 时区资料不存在."
+
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+msgid "Timezone"
+msgstr "时区"
+
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "画面"
+
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
+msgid "Value must be an integer."
+msgstr "值必须是整数。"
+
+#: ../extensions/cpsection/frame/view.py:27
+msgid "never"
+msgstr "从不"
+
+#: ../extensions/cpsection/frame/view.py:28
+msgid "instantaneous"
+msgstr "即时"
+
+#: ../extensions/cpsection/frame/view.py:29
+#, python-format, 
+#, python-format
+msgid "%s seconds"
+msgstr "%s 秒"
+
+#: ../extensions/cpsection/frame/view.py:54
+msgid "Activation Delay"
+msgstr "延期激活"
+
+#: ../extensions/cpsection/frame/view.py:78
+msgid "Corner"
+msgstr "角落"
+
+#: ../extensions/cpsection/frame/view.py:113
+msgid "Edge"
+msgstr "边缘"
+
+#: ../extensions/cpsection/keyboard/__init__.py:21
+#: ../extensions/cpsection/keyboard/view.py:32
+msgid "Keyboard"
+msgstr "键盘"
+
+#: ../extensions/cpsection/keyboard/view.py:190
+msgid "Keyboard Model"
+msgstr "键盘型号"
+
+#: ../extensions/cpsection/keyboard/view.py:250
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../extensions/cpsection/keyboard/view.py:319
+msgid "Keyboard Layout(s)"
+msgstr "键盘布局"
+
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:33
+msgid "Language"
+msgstr "语言"
+
+#: ../extensions/cpsection/language/model.py:30
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "无法读取~/.i18n. 创建标准设置."
+
+#: ../extensions/cpsection/language/model.py:129
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "无法确定代码为 %s 的语言"
+
+#: ../extensions/cpsection/language/model.py:152
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "对不起，我不会说 '%s'"
+
+#: ../extensions/cpsection/language/view.py:57
+msgid ""
+"Add languages in the order you prefer. If a translation is not available, "
+"the next in the list will be used."
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr "数据机设定"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:94
+msgid "Username:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:106
+msgid "Password:"
+msgstr "密码∶"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:118
+msgid "Number:"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr ""
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr ""
+
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:29
+msgid "Network"
+msgstr "网络"
+
+#: ../extensions/cpsection/network/model.py:71
+msgid "State is unknown."
+msgstr "未知状态"
+
+#: ../extensions/cpsection/network/model.py:99
+msgid "Error in specified radio argument use on/off."
+msgstr "给定无线信号开/关时发生错误"
+
+#: ../extensions/cpsection/network/model.py:140
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "给定无线信号开/关时发生错误"
+
+#: ../extensions/cpsection/network/view.py:61
+msgid "Wireless"
+msgstr "无线"
+
+#: ../extensions/cpsection/network/view.py:69
+msgid "Turn off the wireless radio to save battery life"
+msgstr "请关闭无线网络信号来增加电池使用时间"
+
+#: ../extensions/cpsection/network/view.py:82
+msgid "Radio"
+msgstr "无线信号"
+
+#: ../extensions/cpsection/network/view.py:98
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "如果你连接不上网络，请尝试删除网络历史资料"
+
+#: ../extensions/cpsection/network/view.py:107
+msgid "Discard network history"
+msgstr "删除网络历史资料"
+
+#: ../extensions/cpsection/network/view.py:122
+msgid "Collaboration"
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:130
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+
+#: ../extensions/cpsection/network/view.py:140
+msgid "Server:"
+msgstr "服务器："
+
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "电源"
+
+#: ../extensions/cpsection/power/model.py:90
+msgid "Error in automatic pm argument, use on/off."
+msgstr "自动省电管理开关发生错误"
+
+#: ../extensions/cpsection/power/model.py:120
+msgid "Error in extreme pm argument, use on/off."
+msgstr "极度省电管理开关发生错误"
+
+#: ../extensions/cpsection/power/view.py:48
+msgid "Power management"
+msgstr "省电管理"
+
+#: ../extensions/cpsection/power/view.py:58
+msgid "Automatic power management (increases battery life)"
+msgstr "自动省电管理(延长电池寿命)"
+
+#: ../extensions/cpsection/power/view.py:86
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
+msgstr "极低电源管理（关闭无线，增加电池使用时间）"
+
+#: ../extensions/cpsection/updater/__init__.py:21
+msgid "Software update"
+msgstr "软件更新"
+
+#: ../extensions/cpsection/updater/view.py:63
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities, and "
+"provide new features."
+msgstr "软件更新修正错误，消除安全漏洞，和提供新的功能。"
+
+#: ../extensions/cpsection/updater/view.py:125
+#, python-format
+msgid "Checking %s..."
+msgstr "正在检查 %s…"
+
+#: ../extensions/cpsection/updater/view.py:127
+#, python-format
+msgid "Downloading %s..."
+msgstr "正在下载 %s…"
+
+#: ../extensions/cpsection/updater/view.py:129
+#, python-format
+msgid "Updating %s..."
+msgstr "正在更新 %s…"
+
+#: ../extensions/cpsection/updater/view.py:139
+msgid "Your software is up-to-date"
+msgstr "您的软件是最新的"
+
+#: ../extensions/cpsection/updater/view.py:141
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] "你可以安装 %s个更新"
+
+#: ../extensions/cpsection/updater/view.py:159
+msgid "Checking for updates..."
+msgstr "正在检查更新…"
+
+#: ../extensions/cpsection/updater/view.py:164
+msgid "Installing updates..."
+msgstr "正在安装更新…"
+
+#: ../extensions/cpsection/updater/view.py:173
+#, python-format
+msgid "%s update was installed"
+msgid_plural "%s updates were installed"
+msgstr[0] "已安装 %s个更新"
+
+#: ../extensions/cpsection/updater/view.py:255
+msgid "Install selected"
+msgstr "安装已选择的更新"
+
+#: ../extensions/cpsection/updater/view.py:276
+#, python-format
+msgid "Download size: %s"
+msgstr "下载大小：%s"
+
+#: ../extensions/cpsection/updater/view.py:364
+#, python-format
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+msgstr ""
+
+#. TRANS: download size is 0
+#: ../extensions/cpsection/updater/view.py:382
+#, fuzzy
+msgid "None"
+msgstr "完成"
+
+#. TRANS: download size of very small updates
+#: ../extensions/cpsection/updater/view.py:385
+msgid "1 KB"
+msgstr "1千字节"
+
+#. TRANS: download size of small updates, e.g. '250 KB'
+#: ../extensions/cpsection/updater/view.py:388
+#, python-format
+msgid "%.0f KB"
+msgstr "%.0f 千字节"
+
+#. TRANS: download size of updates, e.g. '2.3 MB'
+#: ../extensions/cpsection/updater/view.py:391
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f 兆字节"
+
+#: ../extensions/deviceicon/battery.py:71
+msgid "My Battery"
+msgstr "我的电池"
+
+#: ../extensions/deviceicon/battery.py:147
+#, fuzzy
+msgid "Removed"
 msgstr "删除"
 
-#: ../shell/view/clipboardmenu.py:63
-msgid "Open"
-msgstr "打开"
+#: ../extensions/deviceicon/battery.py:150
+msgid "Charging"
+msgstr "正在充电"
 
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "增添到日志中"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Very little power remaining"
+msgstr "只剩下很少电力"
 
-#: ../shell/view/clipboardmenu.py:213
+#: ../extensions/deviceicon/battery.py:158
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "剪贴板物件: %s."
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "剩下 %(hour)d:%(min).2d"
 
-#: ../shell/hardware/keydialog.py:149
-msgid "Key Type:"
-msgstr "密钥类型:"
+#: ../extensions/deviceicon/battery.py:161
+msgid "Charged"
+msgstr "充电完成"
 
-#: ../shell/hardware/keydialog.py:169
-msgid "Authentication Type:"
-msgstr "验证类型:"
+#: ../extensions/deviceicon/network.py:49
+#, python-format
+msgid "IP address: %s"
+msgstr "IP 位址：%s"
+
+#: ../extensions/deviceicon/network.py:104
+#: ../extensions/deviceicon/network.py:303
+#: ../src/jarabe/desktop/networkviews.py:140
+#: ../src/jarabe/desktop/networkviews.py:508
+msgid "Disconnect"
+msgstr "断开连接"
+
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:295
+#: ../src/jarabe/desktop/networkviews.py:243
+#: ../src/jarabe/desktop/networkviews.py:547
+#: ../src/jarabe/desktop/networkviews.py:680
+msgid "Connecting..."
+msgstr "正在连线…"
+
+#: ../extensions/deviceicon/network.py:117
+#: ../extensions/deviceicon/network.py:185
+#: ../src/jarabe/desktop/networkviews.py:253
+#: ../src/jarabe/desktop/networkviews.py:553
+#: ../src/jarabe/desktop/networkviews.py:686
+msgid "Connected"
+msgstr "已连线"
+
+#: ../extensions/deviceicon/network.py:130
+msgid "No wireless connection"
+msgstr "没有无线网络"
+
+#: ../extensions/deviceicon/network.py:144
+msgid "Channel"
+msgstr "频道"
 
-#: ../shell/hardware/keydialog.py:250
-msgid "Encryption Type:"
-msgstr "加密类型:"
+#: ../extensions/deviceicon/network.py:159
+msgid "Wired Network"
+msgstr "有线网络"
 
-#: ../shell/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "开始..."
+#: ../extensions/deviceicon/network.py:188
+msgid "Speed"
+msgstr "速度"
 
-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "继续"
+#: ../extensions/deviceicon/network.py:213
+msgid "Wireless modem"
+msgstr "无线数据机"
 
-#: ../shell/view/home/activitiesdonut.py:111
-#: ../lib/sugar/activity/activity.py:132
-msgid "Stop"
-msgstr "停止"
+#: ../extensions/deviceicon/network.py:281
+msgid "Please wait..."
+msgstr "请稍候…"
 
-#: ../shell/view/Shell.py:285
-msgid "Screenshot"
-msgstr "屏幕抓图"
+#: ../extensions/deviceicon/network.py:286
+#: ../src/jarabe/desktop/networkviews.py:136
+#: ../src/jarabe/desktop/networkviews.py:504
+#: ../src/jarabe/desktop/networkviews.py:637
+msgid "Connect"
+msgstr "连接"
 
-#: ../shell/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "重新启动"
+#: ../extensions/deviceicon/network.py:287
+msgid "Disconnected"
+msgstr "已切断"
 
-#: ../shell/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "关闭系统"
+#: ../extensions/deviceicon/network.py:294
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:71
+#: ../src/jarabe/frame/activitiestray.py:602
+#: ../src/jarabe/frame/activitiestray.py:704
+#: ../src/jarabe/frame/activitiestray.py:732
+msgid "Cancel"
+msgstr "取消"
 
-#: ../shell/view/home/HomeBox.py:170
-msgid "Register"
-msgstr "注册"
+#: ../extensions/deviceicon/network.py:333
+msgid "Try connection again"
+msgstr "请再尝试连线"
+
+#: ../extensions/deviceicon/network.py:336
+#, python-format
+msgid "Error: %s"
+msgstr "错误：%s"
 
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. 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
-#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
-#: ../shell/view/devices/network/wireless.py:113
-#: ../shell/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "断开..."
-
-#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
-#: ../shell/view/devices/network/mesh.py:62
-#: ../shell/view/devices/network/mesh.py:66
+#: ../extensions/deviceicon/network.py:340
+#, python-format
+msgid "Suggestion: %s"
+msgstr "建议：%s"
+
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+msgid "Connected for %s"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:355
+#: ../extensions/deviceicon/network.py:356
+#, python-format
+msgid "%d KB"
+msgstr "%d 千字节"
+
+#: ../extensions/deviceicon/network.py:361
+msgid "Check your Pin/Puk configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:364
+msgid "Check your Access Point Name (APN) configuration"
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:368
+msgid "Check the Number configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:370
+msgid "Check your configuration."
+msgstr ""
+
+#: ../extensions/deviceicon/network.py:612
 msgid "Mesh Network"
 msgstr "网状网络"
 
-#: ../shell/view/home/MeshBox.py:300
-msgid "Join"
-msgstr "加入"
+#: ../extensions/deviceicon/network.py:656
+#, python-format, fuzzy
+msgid "Mesh Network %s"
+msgstr "网状网络 %s"
 
-#: ../shell/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "我的电池状态"
+#: ../extensions/deviceicon/network.py:779
+msgid "No GSM connection available."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "电池充电中"
+#: ../extensions/deviceicon/network.py:780
+msgid "Create a connection in the control panel."
+msgstr ""
 
-#: ../shell/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "电池放电中"
+#: ../extensions/deviceicon/speaker.py:61
+msgid "My Speakers"
+msgstr "我的扬声器"
 
-#: ../shell/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "电池充电完成"
+#: ../extensions/deviceicon/speaker.py:138
+msgid "Unmute"
+msgstr "取消静音"
 
-#: ../shell/view/devices/network/wireless.py:61
-msgid "Disconnected"
-msgstr "已切断"
+#: ../extensions/deviceicon/speaker.py:141
+msgid "Mute"
+msgstr "无声"
 
-#: ../shell/view/devices/network/wireless.py:131
-msgid "Channel"
-msgstr "频道"
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "finger"
+msgstr "手指"
 
-#: ../shell/view/frame/zoomtoolbar.py:42
-msgid "Neighborhood"
-msgstr "邻居"
+#: ../extensions/deviceicon/touchpad.py:39
+msgid "stylus"
+msgstr ""
+
+#: ../extensions/deviceicon/touchpad.py:68
+msgid "My touchpad"
+msgstr "我的触控板"
 
-#: ../shell/view/frame/zoomtoolbar.py:54
+#: ../extensions/globalkey/screenshot.py:59
+msgid "Mesh"
+msgstr "网状网络"
+
+#: ../extensions/globalkey/screenshot.py:61
+#: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr "组"
 
-#: ../shell/view/frame/zoomtoolbar.py:66
+#: ../extensions/globalkey/screenshot.py:63
+#: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr "家"
 
-#: ../shell/view/frame/zoomtoolbar.py:78
+#: ../extensions/globalkey/screenshot.py:69
+#: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr "活动"
 
-#: ../lib/sugar/activity/activity.py:115
-msgid "Share with:"
-msgstr "共享:"
+#: ../extensions/globalkey/screenshot.py:72
+msgid "Screenshot"
+msgstr "屏幕抓图"
+
+#: ../extensions/globalkey/screenshot.py:74
+#, python-format
+msgid "Screenshot of \"%s\""
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:117
-msgid "Private"
-msgstr "私人"
+#: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:118
-msgid "My Neighborhood"
-msgstr "我的邻居"
+#: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:126
-msgid "Keep"
-msgstr "保持"
+#: ../data/sugar.schemas.in.h:3
+msgid "Backup URL"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:245
-msgid "Undo"
-msgstr "撤销"
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:250
-msgid "Redo"
-msgstr "重复"
+#: ../data/sugar.schemas.in.h:5
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rgb colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:260
-msgid "Copy"
-msgstr "复制"
+#: ../data/sugar.schemas.in.h:6
+msgid "Corner Delay"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:265
-msgid "Paste"
-msgstr "粘贴"
+#: ../data/sugar.schemas.in.h:7
+msgid "Default font face"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Default font size"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:9
+msgid "Default nick"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Delay for the activation of the frame using the edges."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Edge Delay"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Favorites Layout"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Favorites resume mode"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Font face that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Font size that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr ""
 
-#: ../lib/sugar/activity/activity.py:454
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:30
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:31
+msgid "If TRUE, Sugar will show a \"Log out\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:34
+msgid "Jabber Server"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:35
+msgid "Keyboard layouts"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:36
+msgid "Keyboard model"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:37
+msgid "Keyboard options"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:38
+msgid "Layout of the favorites view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:39
+msgid ""
+"List of keyboard layouts. Each entry should be in the form layout(variant)"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:40
+msgid "List of keyboard options."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:41
+msgid "Power Automatic"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:42
+msgid "Power Automatic."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:43
+msgid "Power Extreme"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:44
+msgid "Power Extreme."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:45
+msgid "Publish to Gadget"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:46
+msgid "Setting for muting the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:47
+msgid "Show Log out"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:50
+msgid "Sound Muted"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:51
+msgid "The keyboard model to be used"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:53
+msgid "Timezone setting for the system."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:54
+msgid "Url of the jabber server to use."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:55
+msgid "Url where the backup is saved to."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:56
+msgid "User Color"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:57
+msgid "User Name"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:58
+msgid "User name that is used throughout the desktop."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:60
+msgid "Volume Level"
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:61
+msgid "Volume level for the sound device."
+msgstr ""
+
+#: ../data/sugar.schemas.in.h:62
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+
+#: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-msgid "%s Activity"
-msgstr "%s 的活动"
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr "sugar控制面板: 警告，在%r模块中发现重复的选项名称: %s "
 
-#: ../lib/sugar/activity/activity.py:824
-msgid "Keep error"
-msgstr "保持错误"
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar控制面板: 键值=%s是不可用的选项"
 
-#: ../lib/sugar/activity/activity.py:825
-msgid "Keep error: all changes will be lost"
-msgstr "保持错误:所有改动都将撤销"
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar控制面板: %s"
 
-#: ../lib/sugar/activity/activity.py:828
-msgid "Don't stop"
-msgstr "不停止"
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:38
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"用法: sugar-control-panel [ option ] key [ args ... ] \n"
+"      sugar环境设置工具 \n"
+"      选项: \n"
+"      -h         显示帮助信息并退出 \n"
+"      -l          列出所有可用的选项 \n"
+"      -h key   显示关于这个key的信息 \n"
+"      -g key   获取key的当前值 \n"
+"      -s key   设置key的当前值 \n"
+"      -c key   清除key的当前值 \n"
+"    "
 
-#: ../lib/sugar/activity/activity.py:831
-msgid "Stop anyway"
-msgstr "停止吧"
+# 如何翻译sugar?
+#: ../src/jarabe/controlpanel/cmd.py:52
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "你需要重新启动系统, 让改变生效.\n"
 
-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
-msgid "Cancel"
-msgstr "取消"
+#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+#: ../src/jarabe/journal/volumestoolbar.py:307
+msgid "Warning"
+msgstr "警告"
 
-#: ../lib/sugar/graphics/alert.py:168
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
+msgid "Changes require restart"
+msgstr "更改需要重启才能生效"
+
+#: ../src/jarabe/controlpanel/gui.py:300
+msgid "Cancel changes"
+msgstr "取消更改"
+
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+msgid "Later"
+msgstr "稍后"
+
+#: ../src/jarabe/controlpanel/gui.py:309
+msgid "Restart now"
+msgstr "立即重启"
+
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+msgid "Done"
+msgstr "完成"
+
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr "确定"
 
-#: ../lib/sugar/graphics/alert.py:216
-msgid "Continue"
-msgstr "继续"
+#: ../src/jarabe/desktop/activitieslist.py:230
+#, python-format
+msgid "Version %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/alert.py:244
-msgid "OK"
-msgstr "确定"
+#: ../src/jarabe/desktop/activitieslist.py:356
+msgid "Confirm erase"
+msgstr "确认删除"
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
-msgid "%d year"
-msgstr "%d 年"
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "确认删除：是否永久删除 %s ？"
+
+#: ../src/jarabe/desktop/activitieslist.py:362
+#: ../src/jarabe/frame/clipboardmenu.py:67
+#: ../src/jarabe/view/viewsource.py:280
+msgid "Keep"
+msgstr "保持"
+
+#: ../src/jarabe/desktop/activitieslist.py:365
+#: ../src/jarabe/desktop/activitieslist.py:419
+#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/palettes.py:126
+msgid "Erase"
+msgstr "删除"
 
-#: ../lib/sugar/graphics/objectchooser.py:175
+#: ../src/jarabe/desktop/activitieslist.py:435
+msgid "Remove favorite"
+msgstr "移除偏好"
+
+#: ../src/jarabe/desktop/activitieslist.py:439
+msgid "Make favorite"
+msgstr "指定偏好"
+
+# TRANS: label for the freeform layout in the favorites view
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:127
+msgid "Freeform"
+msgstr "自由形式"
+
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:215
+msgid "Ring"
+msgstr ""
+
+# TRANS: label for the spiral layout in the favorites view
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:402
+msgid "Spiral"
+msgstr "螺旋形"
+
+# TRANS: label for the box layout in the favorites view
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:472
+msgid "Box"
+msgstr "方形"
+
+# TRANS: label for the box layout in the favorites view
+#. TRANS: label for the box layout in the favorites view
+#: ../src/jarabe/desktop/favoriteslayout.py:515
+msgid "Triangle"
+msgstr "三角形"
+
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Registration Failed"
+msgstr "注册失败"
+
+#: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
-msgid "%d years"
-msgstr "%d 年"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/jarabe/desktop/favoritesview.py:341
+msgid "Registration Successful"
+msgstr "注册成功"
+
+#: ../src/jarabe/desktop/favoritesview.py:342
+msgid "You are now registered with your school server."
+msgstr "您已成功注册到校园服务器。"
+
+#: ../src/jarabe/desktop/favoritesview.py:641
+msgid "Register"
+msgstr "注册"
+
+#: ../src/jarabe/desktop/favoritesview.py:643
+#: ../src/jarabe/desktop/favoritesview.py:660
+msgid "Register again"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:66
+msgid "Software Update"
+msgstr "软件更新"
+
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr "更新活动使其与新版软件兼容"
+
+#: ../src/jarabe/desktop/homebox.py:76
+msgid "Check now"
+msgstr "立即检查"
+
+#: ../src/jarabe/desktop/homebox.py:197
+msgid "List view"
+msgstr "列表"
+
+#: ../src/jarabe/desktop/homebox.py:198
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:253
+msgid "Favorites view"
+msgstr ""
+
+#: ../src/jarabe/desktop/homebox.py:254
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:143
+msgid "Key Type:"
+msgstr "密钥类型:"
+
+#: ../src/jarabe/desktop/keydialog.py:163
+msgid "Authentication Type:"
+msgstr "验证类型:"
+
+#: ../src/jarabe/desktop/keydialog.py:229
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:238
+msgid "Wireless Security:"
+msgstr ""
+
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:91
+#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+msgid "Resume"
+msgstr "继续"
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/meshbox.py:96
+#: ../src/jarabe/frame/activitiestray.py:182
+msgid "Join"
+msgstr "加入"
+
+#: ../src/jarabe/desktop/networkviews.py:500
 #, python-format
-msgid "%d month"
-msgstr "%d 月"
+msgid "Ad-hoc Network %d"
+msgstr ""
+
+#: ../src/jarabe/desktop/networkviews.py:634
+#, python-format, fuzzy
+msgid "Mesh Network %d"
+msgstr "网状网络 %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:143
+msgid "Cannot connect to the server."
+msgstr "无法连接到服务器。"
 
-#: ../lib/sugar/graphics/objectchooser.py:176
+#: ../src/jarabe/desktop/schoolserver.py:150
+msgid "The server could not complete the request."
+msgstr "服务器无法处理请求。"
+
+#: ../src/jarabe/frame/activitiestray.py:187
+#: ../src/jarabe/frame/activitiestray.py:574
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
-msgid "%d months"
-msgstr "%d 月"
+msgid "%dB"
+msgstr "%d字节"
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-msgid "%d week"
-msgstr "%d 星期"
+msgid "%dKB"
+msgstr "%d千字节"
 
-#: ../lib/sugar/graphics/objectchooser.py:177
+#: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
-msgid "%d weeks"
-msgstr "%d 星期"
+msgid "%dMB"
+msgstr "%d兆字节"
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
-msgid "%d day"
-msgstr "%d 天"
+msgid "%s of %s"
+msgstr "%s 中的 %s"
 
-#: ../lib/sugar/graphics/objectchooser.py:178
+#: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
-msgid "%d days"
-msgstr "%d 天"
+msgid "Transfer from %s"
+msgstr "传送自 %s"
+
+#: ../src/jarabe/frame/activitiestray.py:569
+msgid "Accept"
+msgstr "接受"
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
-msgid "%d hour"
-msgstr "%d 小时"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:639
+#: ../src/jarabe/frame/activitiestray.py:757
+msgid "Dismiss"
+msgstr "关闭"
 
-#: ../lib/sugar/graphics/objectchooser.py:179
+#: ../src/jarabe/frame/activitiestray.py:643
+msgid "The other participant canceled the file transfer"
+msgstr "对方已取消档案传输"
+
+#: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
-msgid "%d hours"
-msgstr "%d 小时"
+msgid "Transfer to %s"
+msgstr "传送到 %s"
+
+#: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
+msgctxt "Clipboard"
+msgid "Remove"
+msgstr "删除"
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open"
+msgstr "打开"
+
+#: ../src/jarabe/frame/clipboardmenu.py:90
+msgid "Open with"
+msgstr "打开方式"
+
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
-msgid "%d minute"
-msgstr "%d 分钟"
+msgid "%s clipping"
+msgstr "%s 裁剪"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "Neighborhood"
+msgstr "邻居"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:39
+msgid "F1"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:41
+msgid "F2"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:43
+msgid "F3"
+msgstr ""
+
+#: ../src/jarabe/frame/zoomtoolbar.py:45
+msgid "F4"
+msgstr ""
+
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "姓名:"
+
+#: ../src/jarabe/intro/window.py:126
+msgid "Click to change color:"
+msgstr "点击来改变颜色:"
+
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+msgid "Back"
+msgstr "后退"
+
+#: ../src/jarabe/intro/window.py:204
+msgid "Next"
+msgstr "下一步"
+
+#: ../src/jarabe/journal/expandedentry.py:156
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/volumestoolbar.py:130
+msgid "Untitled"
+msgstr "无标题"
 
-#: ../lib/sugar/graphics/objectchooser.py:180
+#: ../src/jarabe/journal/expandedentry.py:245
+msgid "No preview"
+msgstr "无预览"
+
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
-msgid "%d minutes"
-msgstr "%d 分钟"
+msgid "Kind: %s"
+msgstr ""
+
+#: ../src/jarabe/journal/expandedentry.py:264
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+msgid "Unknown"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
-msgid "%d second"
-msgstr "%d 秒"
+msgid "Date: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:181
+#: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
-msgid "%d seconds"
-msgstr "%d 秒"
+msgid "Size: %s"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:191
-msgid " and "
-msgstr "和"
+#: ../src/jarabe/journal/expandedentry.py:294
+#: ../src/jarabe/journal/misc.py:108
+msgid "No date"
+msgstr "无日期"
+
+#: ../src/jarabe/journal/expandedentry.py:301
+msgid "Participants:"
+msgstr "参与者:"
+
+#: ../src/jarabe/journal/expandedentry.py:323
+msgid "Description:"
+msgstr "说明:"
+
+#: ../src/jarabe/journal/expandedentry.py:348
+msgid "Tags:"
+msgstr "标签:"
+
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/palettes.py:198
+#: ../src/jarabe/journal/volumestoolbar.py:368
+msgid "Journal"
+msgstr "日志"
+
+#: ../src/jarabe/journal/journaltoolbox.py:71
+msgid "Search"
+msgstr "搜索"
+
+#: ../src/jarabe/journal/journaltoolbox.py:138
+msgid "Anytime"
+msgstr "任何时间"
+
+#: ../src/jarabe/journal/journaltoolbox.py:140
+msgid "Today"
+msgstr "今天"
+
+#: ../src/jarabe/journal/journaltoolbox.py:142
+msgid "Since yesterday"
+msgstr "一天内"
+
+# TRANS: Filter entries modified during the last 7 days.
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/jarabe/journal/journaltoolbox.py:144
+msgid "Past week"
+msgstr "上一周"
+
+# TRANS: Filter entries modified during the last 30 days.
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/jarabe/journal/journaltoolbox.py:146
+msgid "Past month"
+msgstr "上个月"
+
+# TRANS: Filter entries modified during the last 356 days.
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/jarabe/journal/journaltoolbox.py:148
+msgid "Past year"
+msgstr "上一年"
+
+#: ../src/jarabe/journal/journaltoolbox.py:155
+msgid "Anyone"
+msgstr "任何人"
+
+#: ../src/jarabe/journal/journaltoolbox.py:157
+msgid "My friends"
+msgstr "我的好友"
+
+#: ../src/jarabe/journal/journaltoolbox.py:158
+msgid "My class"
+msgstr "我的类别"
+
+# TRANS: Item in a combo box that filters by entry type.
+#: ../src/jarabe/journal/journaltoolbox.py:300
+msgid "Anything"
+msgstr "所有类别"
+
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:93
+msgid "Copy to"
+msgstr ""
 
-#: ../lib/sugar/graphics/objectchooser.py:193
-msgid ", "
-msgstr ","
+#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+msgid "Duplicate"
+msgstr ""
 
-# 如何翻译sugar?
-#: ../shell/controlpanel/control.py:213
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "你需要重新启动系统, 让改变生效.\n"
+#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+#: ../src/jarabe/journal/volumestoolbar.py:315
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:267
-msgid "Error in specified color modifiers."
-msgstr "给定变化色时发生错误"
+#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+#: ../src/jarabe/journal/volumestoolbar.py:316
+msgid "Error"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:270
-msgid "Error in specified colors."
-msgstr "给定颜色时发生错误"
+# TRANS: Action label for starting an entry.
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/palettes.py:74
+msgid "Start"
+msgstr "启动"
 
-#: ../shell/controlpanel/control.py:307
-msgid "off"
-msgstr "关闭"
+#: ../src/jarabe/journal/journaltoolbox.py:525
+msgid "Sort by date modified"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:309
-msgid "on"
-msgstr "开启"
+#: ../src/jarabe/journal/journaltoolbox.py:526
+msgid "Sort by date created"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:310
-msgid "State is unknown."
-msgstr "未知状态"
+#: ../src/jarabe/journal/journaltoolbox.py:527
+msgid "Sort by size"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:332
-msgid "Error in specified radio argument use on/off."
-msgstr "给定无线信号开/关时发生错误"
+#: ../src/jarabe/journal/journaltoolbox.py:536
+msgid "Sort view"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:336
-msgid "Permission denied. You need to be root to run this method."
-msgstr "权限不足. 你需要管理员权限来执行."
+#: ../src/jarabe/journal/listview.py:316
+msgid "Your Journal is empty"
+msgstr "空白日志"
 
-#: ../shell/controlpanel/control.py:366
-msgid "Error in reading timezone"
-msgstr "阅读时区资料时发生错误"
+#: ../src/jarabe/journal/listview.py:319
+msgid "Your documents folder is empty"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:397
+#: ../src/jarabe/journal/listview.py:321
+msgid "The device is empty"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:323
+msgid "No matching entries"
+msgstr ""
+
+#: ../src/jarabe/journal/listview.py:397
+msgid "Clear search"
+msgstr ""
+
+#: ../src/jarabe/journal/misc.py:273
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr "从 %s 复制时区资料时发生错误: %s"
+msgid "Older Version Of %s Activity"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:402
+#: ../src/jarabe/journal/misc.py:274
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr "改变时区设置的权限: %s"
+msgid "Do you want to downgrade to version %s"
+msgstr ""
 
-#: ../shell/controlpanel/control.py:412
-msgid "Error timezone does not exist."
-msgstr "错误, 时区资料不存在."
+#: ../src/jarabe/journal/modalalert.py:64
+msgid "Your Journal is full"
+msgstr "日志空间已满"
+
+#: ../src/jarabe/journal/modalalert.py:68
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr "请删除一些旧的日志条目以腾出空间给新的日志。"
+
+#: ../src/jarabe/journal/modalalert.py:80
+msgid "Show Journal"
+msgstr "显示日志"
+
+#: ../src/jarabe/journal/objectchooser.py:146
+msgid "Choose an object"
+msgstr "选择对象"
+
+#: ../src/jarabe/journal/objectchooser.py:151
+#: ../src/jarabe/view/viewsource.py:410
+msgid "Close"
+msgstr "关闭"
 
-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#: ../src/jarabe/journal/palettes.py:72
+msgid "Resume with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:75
+msgid "Start with"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+msgid "No activity to start entry"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:112
+msgid "Send to"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:121
+msgid "View Details"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:160
+msgid "Entries without a file cannot be sent."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+#: ../src/jarabe/journal/volumestoolbar.py:306
+msgid "Entries without a file cannot be copied."
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:267
+msgid "Clipboard"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:322
+msgid "No friends present"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:327
+msgid "No valid connection found"
+msgstr ""
+
+#: ../src/jarabe/journal/palettes.py:355
+msgid "No activity to resume entry"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:209
+msgid "Documents"
+msgstr ""
+
+#: ../src/jarabe/journal/volumestoolbar.py:391
+#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr "不能访问%s. 创建标准设置."
+msgid "%(free_space)d MB Free"
+msgstr "剩余%(free_space)d MB 空间"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr ""
 
-#: ../shell/controlpanel/control.py:463
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr ""
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr ""
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:67
+msgid "Remove friend"
+msgstr "删除好友"
+
+#: ../src/jarabe/view/buddymenu.py:70
+msgid "Make friend"
+msgstr "结交好友"
+
+#: ../src/jarabe/view/buddymenu.py:87
+msgid "Shutdown"
+msgstr "关闭系统"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "重启"
+
+#: ../src/jarabe/view/buddymenu.py:101
+msgid "Logout"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:106
+msgid "My Settings"
+msgstr ""
+
+#: ../src/jarabe/view/buddymenu.py:142
 #, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "无法确定代码为 %s 的语言"
+msgid "Invite to %s"
+msgstr "邀请到%s"
 
-#: ../shell/controlpanel/control.py:473
+#: ../src/jarabe/view/launcher.py:145
 #, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "对不起，我不会说 '%s'"
+msgid "<b>%s</b> failed to start."
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:105
-msgid "Connected to a School Mesh Portal"
-msgstr "已连接到一个学校网状网络门户"
+#: ../src/jarabe/view/palettes.py:48
+msgid "Starting..."
+msgstr "开始..."
 
-#: ../shell/view/devices/network/mesh.py:107
-msgid "Looking for a School Mesh Portal..."
-msgstr "寻找学校网状网络门户中..."
+#: ../src/jarabe/view/palettes.py:58
+msgid "Activity failed to start"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:110
-msgid "Connected to an XO Mesh Portal"
-msgstr "已连接到一个XO网状网络门户"
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:91
+msgid "View Source"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:112
-msgid "Looking for an XO Mesh Portal..."
-msgstr "寻找XO网状网络门户中..."
+#: ../src/jarabe/view/palettes.py:102
+msgid "Stop"
+msgstr "停止"
 
-#: ../shell/view/devices/network/mesh.py:115
-msgid "Connected to a Simple Mesh"
-msgstr "已连接到一个简单网状网络"
+#: ../src/jarabe/view/palettes.py:139
+msgid "Start new"
+msgstr ""
 
-#: ../shell/view/devices/network/mesh.py:117
-msgid "Starting a Simple Mesh"
-msgstr "创建一个简单网状网络"
+#: ../src/jarabe/view/palettes.py:180
+msgid "Show contents"
+msgstr "显示内容"
 
-#: ../shell/view/devices/network/mesh.py:124
-msgid "Unknown Mesh"
-msgstr "未知网状网络"
+#: ../src/jarabe/view/palettes.py:229
+#, fuzzy
+msgctxt "Volume"
+msgid "Remove"
+msgstr "删除"
 
-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
-msgid "About this XO"
+#: ../src/jarabe/view/viewsource.py:263
+msgid "Instance Source"
 msgstr ""
 
-#: ../shell/view/home/HomeBox.py:222
-msgid "Not available"
+#: ../src/jarabe/view/viewsource.py:312
+msgid "Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:374
+msgid "Activity Bundle Source"
 msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:393
+msgid "Sugar Toolkit Source"
+msgstr ""
+
+#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+#, python-format
+msgid "View source: %r"
+msgstr ""
+
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr ""
+
+#~ msgid "Add to journal"
+#~ msgstr "增添到日志中"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "剪贴板物件: %s."
+
+#~ msgid "Encryption Type:"
+#~ msgstr "加密类型:"
+
+#~ msgid "Reboot"
+#~ msgstr "重新启动"
+
+#~ msgid "Disconnect..."
+#~ msgstr "断开..."
+
+#~ msgid "My Battery life"
+#~ msgstr "我的电池状态"
+
+#~ msgid "Battery charging"
+#~ msgstr "电池充电中"
+
+#~ msgid "Battery discharging"
+#~ msgstr "电池放电中"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "电池充电完成"
+
+#~ msgid "Share with:"
+#~ msgstr "共享:"
+
+#~ msgid "Private"
+#~ msgstr "私人"
+
+#~ msgid "My Neighborhood"
+#~ msgstr "我的邻居"
+
+#~ msgid "Undo"
+#~ msgstr "撤销"
+
+#~ msgid "Redo"
+#~ msgstr "重复"
+
+#~ msgid "Copy"
+#~ msgstr "复制"
+
+#~ msgid "Paste"
+#~ msgstr "粘贴"
+
+#, python-format
+#~ msgid "%s Activity"
+#~ msgstr "%s 的活动"
+
+#~ msgid "Keep error"
+#~ msgstr "保持错误"
+
+#~ msgid "Keep error: all changes will be lost"
+#~ msgstr "保持错误:所有改动都将撤销"
+
+#~ msgid "Don't stop"
+#~ msgstr "不停止"
+
+#~ msgid "Stop anyway"
+#~ msgstr "停止吧"
+
+#~ msgid "Continue"
+#~ msgstr "继续"
+
+#~ msgid "OK"
+#~ msgstr "确定"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgstr "%d 年"
+
+#, python-format
+#~ msgid "%d years"
+#~ msgstr "%d 年"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgstr "%d 月"
+
+#, python-format
+#~ msgid "%d months"
+#~ msgstr "%d 月"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgstr "%d 星期"
+
+#, python-format
+#~ msgid "%d weeks"
+#~ msgstr "%d 星期"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgstr "%d 天"
+
+#, python-format
+#~ msgid "%d days"
+#~ msgstr "%d 天"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgstr "%d 小时"
+
+#, python-format
+#~ msgid "%d hours"
+#~ msgstr "%d 小时"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgstr "%d 分钟"
+
+#, python-format
+#~ msgid "%d minutes"
+#~ msgstr "%d 分钟"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgstr "%d 秒"
+
+#~ msgid " and "
+#~ msgstr "和"
+
+#~ msgid ", "
+#~ msgstr ","
+
+#~ msgid "off"
+#~ msgstr "关闭"
+
+#~ msgid "on"
+#~ msgstr "开启"
+
+#~ msgid "Permission denied. You need to be root to run this method."
+#~ msgstr "权限不足. 你需要管理员权限来执行."
+
+#~ msgid "Error in reading timezone"
+#~ msgstr "阅读时区资料时发生错误"
+
+#, python-format
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "从 %s 复制时区资料时发生错误: %s"
+
+#, python-format
+#~ msgid "Changing permission of timezone: %s"
+#~ msgstr "改变时区设置的权限: %s"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "已连接到一个学校网状网络门户"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "寻找学校网状网络门户中..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "已连接到一个XO网状网络门户"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "寻找XO网状网络门户中..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "已连接到一个简单网状网络"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "创建一个简单网状网络"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "未知网状网络"