Add raw patchset 20120124 (silbe) for sugar

75 files changed, 151688 insertions, 0 deletions

diff --git a/rpms/sugar/0000-Add-files-from-git-that-are-missing-from-tarball.patch b/rpms/sugar/0000-Add-files-from-git-that-are-missing-from-tarball.patch
new file mode 100644
index 0000000..91f84a8
--- /dev/null
+++ b/rpms/sugar/0000-Add-files-from-git-that-are-missing-from-tarball.patch
@@ -0,0 +1,2900 @@
+From 9d3dabd3c477e6d2939c7b2d1e10478987cd7195 Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <sascha-pgp@silbe.org>
+Date: Tue, 13 Dec 2011 13:07:38 +0100
+Subject: [PATCH] Add files from git that are missing from tarball
+
+Since we're applying patches directly exported from git, we need to have all
+the files the git repository has.
+
+This patch was created using the following commands:
+
+wget -nd http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.94.1.tar.bz2
+tar -xjf sugar-0.94.1.tar.bz2
+cd sugar-0.94.1
+find * -type f | sort > ../tarball-files.lst
+cd ..
+git clone git://git.sugarlabs.org/sugar/mainline sugar
+cd sugar
+git checkout v0.94.1
+find * -type f | sort > ../git-files.lst
+comm -13 ../tarball-files.lst ../git-files.lst > ../missing-files.lst
+git diff 2cc103db83ed1550e2a9e92bf3306e4476c1297a..v0.94.1 -- $(cat ../missing-files.lst ) > ../0000-add-missing-files.patch
+git rm -f $(cat ../missing-files.lst )
+git commit -m "remove files missing from tarball"
+git apply ../0000-add-missing-files.patch
+git add -A
+git commit
+---
+ MAINTAINERS            |    9 +
+ autogen.sh             |    4 +
+ data/.gitignore        |    2 +
+ docs/GPL-C.txt         |   18 +
+ docs/GPL-python.txt    |   16 +
+ docs/LGPL-C.txt        |   18 +
+ docs/LGPL-python.txt   |   17 +
+ docs/controls.txt      |  199 ++++++
+ docs/design.txt        |  126 ++++
+ docs/release_howto.txt |   73 ++
+ po/hy.po               | 1764 ++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pseudo.po           |  517 ++++++++++++++
+ src/jarabe/.gitignore  |    1 +
+ 13 files changed, 2764 insertions(+), 0 deletions(-)
+ create mode 100644 MAINTAINERS
+ create mode 100755 autogen.sh
+ create mode 100644 data/.gitignore
+ create mode 100644 docs/GPL-C.txt
+ create mode 100644 docs/GPL-python.txt
+ create mode 100644 docs/LGPL-C.txt
+ create mode 100644 docs/LGPL-python.txt
+ create mode 100644 docs/controls.txt
+ create mode 100644 docs/design.txt
+ create mode 100644 docs/release_howto.txt
+ create mode 100644 po/hy.po
+ create mode 100644 po/pseudo.po
+ create mode 100644 src/jarabe/.gitignore
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+new file mode 100644
+index 0000000..9c63644
+--- /dev/null
++++ b/MAINTAINERS
+@@ -0,0 +1,9 @@
++== Current maintainers ==
++
++Aleksey Lim <alsroot@member.fsf.org> -- Journal
++Tomeu Vizoso <tomeu@sugarlabs.org>
++
++== Past maintainers ==
++
++Marco Pesenti Gritti <marcopg@sugarlabs.org>
++
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..a71e202
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,4 @@
++#!/bin/sh
++intltoolize
++autoreconf -i
++./configure --enable-maintainer-mode "$@"
+diff --git a/data/.gitignore b/data/.gitignore
+new file mode 100644
+index 0000000..8263f12
+--- /dev/null
++++ b/data/.gitignore
+@@ -0,0 +1,2 @@
++*.gtkrc
++sugar.schemas
+diff --git a/docs/GPL-C.txt b/docs/GPL-C.txt
+new file mode 100644
+index 0000000..aa909b4
+--- /dev/null
++++ b/docs/GPL-C.txt
+@@ -0,0 +1,18 @@
++/*
++ * Copyright (C) 2006, Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ */
++
+diff --git a/docs/GPL-python.txt b/docs/GPL-python.txt
+new file mode 100644
+index 0000000..96e81d1
+--- /dev/null
++++ b/docs/GPL-python.txt
+@@ -0,0 +1,16 @@
++# Copyright (C) 2006, Red Hat, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
+diff --git a/docs/LGPL-C.txt b/docs/LGPL-C.txt
+new file mode 100644
+index 0000000..88798f8
+--- /dev/null
++++ b/docs/LGPL-C.txt
+@@ -0,0 +1,18 @@
++/*
++ * Copyright (C) 2006, Red Hat, Inc.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
+diff --git a/docs/LGPL-python.txt b/docs/LGPL-python.txt
+new file mode 100644
+index 0000000..1db1ea4
+--- /dev/null
++++ b/docs/LGPL-python.txt
+@@ -0,0 +1,17 @@
++# Copyright (C) 2006, Red Hat, Inc.
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License as published by the Free Software Foundation; either
++# version 2 of the License, or (at your option) any later version.
++#
++# This library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the
++# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++# Boston, MA 02111-1307, USA.
++
+diff --git a/docs/controls.txt b/docs/controls.txt
+new file mode 100644
+index 0000000..fa977ef
+--- /dev/null
++++ b/docs/controls.txt
+@@ -0,0 +1,199 @@
++Colors
++
++Black - palettes, popups
++Toolbar Grey #262626 - toolbars, expanded palette
++Button Grey #808080 - buttons
++Selection Grey #A6A6A6 - selection, expanded panels
++Panel Grey #C0C0C0 - panel, desktop
++Text field Grey #E5E5E5 - text field background
++White - pressed states and multiline text areas
++
++States
++
++Default - gtk.STATE_NORMAL
++Focused - gtk.STATE_SELECTED
++Pressed - gtk.STATE_ACTIVE
++Hover - gtk.STATE_PRELIGHT
++Inactive - gtk.STATE_INSENSITIVE
++
++gtk.Button
++
++* The image should work the same of the image button
++* Need to write a theme to match the visual style
++* Cancel should never be default because you can always activate it with Esc
++* Radius should be 1/2 of the control height
++* Write a list of stock icons people should use and replace them in the theme to match our visual style
++
++sugar.Icon
++
++* Used in canvas-like views so probably an Hippo item.
++* Svg Only.
++* It should support xo colors easily.
++* Rollovers with a focus mark.
++
++sugar.IconButton
++
++* Support for SVG and png.
++* Icons should be grey scale. But might be coloured with the XO colors (svg only)
++* Size of the button is 75 pixels, size of the icon canvas is 55 and suggested icon size is around 45.
++* States, defaults:
++    Hover : Black
++    Pressed : Rounded rectangle 61 pixels, 10 pixels of radius, filled in selection grey
++    Focused : Rounded rectangle 61 pixels, 10 pixels of radius, stroked in white 2.25 points
++    Inactive. Fallbacks if no inactive icon is specified.
++        Svg: Remove the fill and render the stroke in button grey
++        Png: just do some effect on the pixbuf, which also work for grey icons
++* You can set an icon for each states which replace the default except for the Hover state of buttons which has rollover.
++* "palette" boolean property. If true show an arrow active immediately on click (but also on hover)
++
++sugar.ToolButton (support for rollovers)
++
++* Contains IconButton
++* There is no palette but a tooltip.
++* Normal: Button grey rounded filled rectangle
++* Inactive: Button grey rounded stroked rectangle
++
++sugar.ToggleIconButton
++
++* Toggled should be like Pressed
++* Inconsistent should be the same of Default (the action depend on the cases)
++* Pressed state and Toggled state is Selection grey
++
++sugar.ToolIconButton
++
++* Contains a ToggleIconButton
++
++gtk.CheckButton
++
++* Match the visual design, shoul be possible with just theme changes
++
++gtk.RadioButton
++
++* Exactly like CheckButton just a different indicator
++
++gtk.OptionMenu
++
++* Match the visual style. Hopefully only theme changes.
++* Add the scroll thing.
++* Groups. Either by a normal separator or a titled separator.
++* Optional support for showing just the icon from the menu (maybe, low priority)
++* Allow fixed sizing of the "button" and ellipsize the label
++
++sugar.Entry
++
++* Support for packing icons before and after the entry. Extend gtk.Entry.
++* Activate/Cancel functionality.
++    Two buttons at the end to the entry and key bindings (Esc and Enter). They are visible only when there are changes.
++    The icons appear only when the field is focused and the content is changed since it gained focus.
++    When hitting escape revert and select all the text.
++
++gtk.ComboxBox
++
++* We miss accept/cancel functionality. Probably patch gtk to allow to replace the entry in the combo box with sugar.Entry.
++
++sugar.SearchEntry
++
++* Use sugar.Entry
++* Search button on the left. Clicking should focus the entry.
++* Cancel button (Esc) on the right, always visible when there is text in the entry. Clicking it will clear the text and focus the textfield.
++* Activate button (Enter) on the right displayed when the content of the text field changed from the last focus or activation.
++* While activating:
++    the Activate button becomes a Spinner.
++    clicking the close button also cancel the search.
++* When activation is completed:
++    The spinner goes away.
++    We *don't* clear the entry but we select the text.
++* Search can either be incremental or on activation. For incremental there is no Accept button. start_spinning and stop_spinning to control the spin icon. start would only spin for an amount of time decided by the widget itself (and documented).
++* The suggestions list is provided by the application. Need to figure out which api to use, either model or signal based.
++* Default implementation of suggestions which automatically save the latest searches.
++
++sugar.DateSelector
++sugar.DateComboBox (lower priority)
++
++* Pluggable calendar implementation to support different kind of calendars (localization).
++* Might reuse gtk.Calendar. We should unify month/year selectors and accellerate the movement gradually.
++
++gtk.SpinButton
++
++* Make it match the visual design, hopefully just theme changes
++
++sugar.ToolItem
++
++* Optional label, either text or icon
++* Used for example to have a label near a SpinButton. Clicking on the label should focus the spin button.
++
++gtk.ProgressBar
++
++* Make it match the visual design, hopefully just theme changes.
++* For determinate progress bars should we always pulse to show that there is activity (power consumption? necessary feedback?)
++* Do not use text inside the progress bar
++
++sugar.Spinner
++
++* pulse() call to keep it running with a timeout
++* stop()
++
++gtk.Range (or sugar.Slider?)
++
++* Property to show the fill in white color, probably default on.
++* Draw the discrete steps.
++* For colored sliders, subclass gtk.Range and add a gradient.
++
++sugar.LevelIndicator
++
++* Set the number of blocks
++* Set the level as percentage
++* Property for discrete or not
++* We can probably use a GtkAdjustment for most of the above.Rollovers
++
++
++gtk.TextView
++
++gtk.ScrolledWindow
++
++* Theme it to match the visual.
++
++sugar.ScrolledWindow
++
++* Support for markers. Line as default and optional support for other shapes (star for bookmarks, circles for xos...). Generic way of add marks and keep them updated (observer?)
++
++gtk.Expander
++
++gtk.Separator
++
++sugar.GroupBox
++
++* just a container
++* set_title and set_title_widget (checkbox, radiobutton...)
++* different color and separator under title
++
++gtk.TreeView
++
++gtk.Notebook
++
++* Expand to fill the whole space by default but property to turn it off
++* Switching tabs with the little arrows should page
++
++Palettes in ToolIconButton, IconButton
++* Inmediately on rollover, show the black background.
++* After a very short delay, show the primary state (name of the action and key shortcut).
++* After a bigger delay, show the popup secondary state.
++* Could be animated.
++* Menu Items would go on the top and then the free-form rollover content.
++* The popup would be a gtk.Window that contains a Label, a MenuShell, an hippo.Canvas (or whatever) and finally a button bar (OK/Cancel).
++* The popup will have a setPrimaryState(label, accelerator) method. For action buttons would be a MenuItem, for the others would only be a Label.
++* The primary state should already have the same width as the secondary state and the expandable areas.
++* Primary states appear and disappear automatically (with a short delay). A click outside makes it disappear instantly.
++* Secondary states appear after a delay, or with a single click on the icon.
++* Secondary disappears with the esc key, clicking outside the popup or clicking on a button inside.
++
++Toolbox
++* When an activity opens, the activity tab should be opened and the focus on the activity title.
++* We must provide an activity tab in the toolbox and would be good to also provide an standard Edit tab.
++
++Grab key
++* We probably will need the grab mode.
++* Highlight the scrollbar in the view the pointer is (the view that will scroll when moving the pointer).
++
++Clipboard
++* Window manager to handle in an invisible window in every corner and forward the events when they are not in the corner, or use XEvIE (X Event Interception Extension).
+diff --git a/docs/design.txt b/docs/design.txt
+new file mode 100644
+index 0000000..37061af
+--- /dev/null
++++ b/docs/design.txt
+@@ -0,0 +1,126 @@
++= Frame =
++
++== Activation and deactivation ==
++
++* Immediately access the frame by hitting any corner pixel (the exact corner point)
++* Hitting any of the screen edges activate the frame after 0.5s delay
++* Pressing and holding the frame key activate the frame until the key is released.
++* Pressing the frame key momentarily toggle the frame. To deactivate it another key press is necessary.
++
++= IRC logs =
++
++Frame
++
++eliason marcopg:  First, you can immediately access the frame by hitting any corner pixel.
++dcbw marcopg: I think that's the issue, yes
++eliason Second, you can activate it from any edge, but there is a half second delay.  In addition to the delay, the timer on the delay only ticks when the mouse is on an edge pixel and also below some threshold velocity, so if the mouse is moving it will not show up.
++eliason marcopg: Third, there will be a frame key.  Pressing and holding this key will invoke the frame until the key is released.  Pressing this key momentarily, however, will toggle the frame and keep it in view until the key is pressed again.
++eliason marcopg:  All of these things are implemented in Flash (The frame key is 8, I think...), with the exception of the mouse velocity threshold on the edges.
++eliason marcopg:  The only other minor usability issue I could see is adding a hit area in the corners.  That is, once the frame is out, have an invisible triangle in each corner that is still considered part of the frame, so that rolling out of the frame to get from one edge to another doesn't hide the frame, by accident.  In fact, doing this would make the delay on hide unnecessary.
++eliason marcopg:  Oh, and other important edges case to think about on the frame:  1)  When someone is dragginan object (XO, file, image, etc) the frame should come out prematurely and without delay (maybe once within a large grid cell of the edge) and highlight to indicate where the object could be dropped.  2)  When the search field is active, the frame should remain out even if the mouse isn't over it.  Only when the search is cleared should it hide again.
++eliason marcopg:  The rollover states are as follows:  1)  Immediate rollover is a black square in the frame cell itself.  2)  Very shortly thereafter (about 1/4 sec) Is the Primary information label and 3) a bit longer after that (about 1/2 sec) the extended panel appears with additional info.
++
++Menu
++
++eliason marcopg:  Deactivation is instantaneous at the moment, but again, based on testing with the software we may want to add a very short delay.  Also, we may want again to have a invisible triangles between the grid cell in the frame and the extended panel.
++eliason Delay between mouse rollover and showing black square:  0
++eliason Delay before primary info animation begins: 1/10 sec
++eliason Duration of primary info extension animation:  1/5 sec
++eliason Delay from end of primary info animation until secondary info:  1/2 sec
++Duration of secondary info animation: 1/5 sec
++
++Text layout
++
++eliason marcopg:  Well, first of all, in the latest screens which we haven't sent out yet, the primary info rollover is designed to fit the text to the nearest microgrid, regardless of the size of the secondary info panel.  The second animation segment will both extend the width and height to fit.
++eliason marcopg:  As far as cutoff goes, I think that's a reasonable solution.  We should allow the primary info text to be as long as the secondary info panel, and beyond that an ellipsis would be a good way to go, though hopefully designers are strongly encouraged NOT to let that happen.
++eliason marcopg:  However, there may be cases when we don't want that to happen. I can think of one, which you haven't seen yet:  "Invite with X X X X X."  The new activity/invite rollover might have the XOs who you are implicitly inviting to start an activity with listed, and we couldn't cut that off (Though we CANget around it and list, say, a max of three people and then indicate that there are 5 more not shown, etc.)
++eliason marcopg:  Right.  I think that, in most cases, there should be some template for it.  If the designer is creating a GUI for an application and making toolsets (such as the color chooser), then we know how big all of those are.  Things like "just text" will mostly show up in OS applications like the clippings and such, so we can just pick a preferred size that shows enough text to be meaningful without compromising too much of the screen.
++
++Mesh view
++
++eliason marcopg:  also important regarding the results:  the fill color should be the background color, so they look like outlines, and the line color should be near enough to the background to make them less contrasty.  Also, all XOs in the result set should be z-sorted to the front of their groups.  That's key.
++eliason marcopg:  The activity icons and XOs are treated separately, so it may be the case that several XOs in a group match the search but the activity their in doesn't, and they would be grayed out independently.
++eliason marcopg:  yes, only the color change.  Colored stuff is the result.  We don't want to actually make things disappear.
++
++
++Mesh discussion
++
++eliason marcopg:  Well, the terminology we're now using for the zoom level labels is:  My Activities, My Friends, My Neighbors.
++eliason marcopg:  Alright, true, so the working terminology (not the labels for the search field, but still used by all of us) is: home, friends, mesh
++eliason marcopg:  If you treat each frieeliason marcopg:  If you treat each friend or group as a node in a graph, and each edge in the graph as a spring, you can let the system reach an equilibrium using a basic physics simulation that will spread the nodes out evenly.nd or group as a node in a graph, and each edge in the graph as a spring, you can let the system reach an equilibrium using a basic physics simulation that will spread the nodes out evenly.
++eliason marcopg:  If you treat each friend or group as a node in a graph, and each edge in the graph as a spring, you can let the system reach an equilibrium using a basic physics simulation that will spread the nodes out evenly.
++eliason marcopg:  There's lots of info on this type of thing online.  To do it right within a given box, you also have to add anchored springs at the corners and such to stretch the whole thing out to fill the space.
++eliason OK, so another basic idea is to keep a very rough downsampled grayscale image around....
++eliason The grayscale value would map to the number of XOs within the grid cell on screen.
++eliason marcopg:  Then, when placing a new one you could just find the best place to place it , though now that I think about it that would probably require a simulated annealing algorithm or something else clever to do...
++marcopg eliason, do you mean macro cell here?
++marcopg i.e. every buddy would be placed in one macro cell
++eliason marcopg:  Well, actually I guess you'd kind of want a blurred brayscale image, where each object placed represents a white circle, but with a gaussian blur so that it acts like a topographic map of the mesh.
++eliason marcopg:  The white spots would be dense, like hills, the black spots would be void of people, like holes.  Then to place a new one, you kind of roll a simulated marble around until you find a good hole to place it in...
++eliason marcopg:  And, yet another idea, which could be used in conjunction with or independent of the above.  You could simply place a small repulsive force between the objects, so that they push each other apart slightly.  You could just place at random and have them adjust accordingly.  This works very much like the spring model, though.
++eliason Of course, the drawback of the third idea is that it's n^2 in the number of groups on the mesh, but that number should never be that large.
++eliason The spring model is a little more complicated, but you only have to place springs between nearby objects, which reduces that somewhat.
++eliason marcopg:  But actually, I think #3 might be the easiest to implement, and work just as well.  It works nicely since it could still allow you to drag them around and the rest of the mesh would react naturally.  In the spring model, you'd have to dynamically add and break spring connections when a node is moved around.
++marcopg eliason, mm was just thinking about this would interact with custom placed nodes...
++marcopg eliason, I never done something similar before so I will really need to play a bit with it...
++eliason marcopg:  Also, #3 is more forgiving:  In the spring model, placing one new node will move EVERY node in the mesh somewhat, if even just a small amount, since the whole system adjusts.  With the repulsion force, only nearby nodes would be affected, except of course through a chain reaction...
++eliason marcopg:  I'm sure we can find documentation.  Basically, you calculate the distance between the two nodes (pythag) and if that distance is less than some threshold you compute the angle between them (atan2) and then you give each one a small repulsive acceleration, and update each frame by treating each with its own acceleration, velocity, and position.
++eliason marcopg:  radiusConstant + (numXos*radiusScale) + ((index%3)*offsetScale)  <-- that gets pretty close to what I'm working with now.
++eliason marcopg:  One addition:  When the groups are small, we don't want to add the snowflake effect, since they fit in neat geometric shapes around the ring.  So we get....actually, here's the ugly line of code:     radius = 25 + .3*(Math.max(participants.length-10,0)) + (i%3)*.5*(Math.max(participants.length-10,0));
++eliason marcopg:  The added ugliness is a bit of code that zeros out the 2nd two quantities if there are less than 10 people in the group.  You could just place them in an if block actually, but I'd done it this way in case I wanted to change the thresholds independently...eliason marcopg:  The added ugliness is a bit of code that zeros out the 2nd two quantities if there are less than 10 people in the group.  You could just place them in an if block actually, but I'd done it this way in case I wanted to change the thresholds independently...
++eliason marcopg:  OK, cool.  The animation is a simple easing algorithm:   position += (targetPostition - position)*percentage.
++eliason marcopg:  Well, that's a function of the radius and the angle computed from above.  targetX = radius*cos(angle), targetY = radius*sin(angle), for each XO.
++marcopg eliason, aaah I see now
++
++eliason marcopg:  The basic problem is that people are crossing an index that is a multiple of the mod, so everyone shifts in and out.  What if, instead, we adjusted the indeces of every XO with an index of  modValue*c greater than the XO that left, and subtract modValue from each of their indices?
++eliason With mod 3, we basically have 3 levels of the ring.  This solution would just shift ONE of those rings couter-clockwise one XO position, leaving the other two rings intact as is.  We move many fewer XOs than before, but we minimize the movement any given XO has to make by spreading it across the ring level instead of moving the last XO all the way across the circle...eliason marcopg:  The basic problem is that people are crossing an index that is a multiple of the mod, so everyone shifts in and out.  What if, instead, we adjusted the indeces of every XO with an index of  modValue*c greater than the XO that left, and subtract modValue from each of their indices?
++eliason With mod 3, we basically have 3 levels of the ring.  This solution would just shift ONE of those rings couter-clockwise one XO position, leaving the other two rings intact as is.  We move many fewer XOs than before, but we minimize the movement any given XO has to make by spreading it across the ring level instead of moving the last XO all the way across the circle...
++eliason marcopg:  The final detail of that, beyond shifting each index down by the mod value, is to shift the very last group of people in the ring down to fill all the holes, if you get my meaning...
++
++Activity startup feedback
++
++I agree we certainly need feedback for this sort of thing.  For
++starters, the icon of the selected activity should immediately appear
++in the ring.  Perhaps we can apply some small animation to this
++activity icon to indicate that it is starting up.  Marco, could you
++use HSV for the icon color, and modulate the S(aturation) on a sin
++curve so the color pulses betwen, say, 0 and 192 until the activity
++starts, at which point it slides up to 255?
++
++Clipboard
++
++<marcopg> eliason, when should the frame be automatically showed? when
++starting the drag or when hitting the corner
++<marcopg> eliason, (the first one would be tricky to implement)
++<eliason> marcopg:  Initially we wanted it to happen on drag, but after
++thinking about this more, it's a bad idea, since it would hide the toolbars,
++and some activities may have toolbars that support drag and drop also.  As
++such, we probably just keep the hot corners as is, and perhaps implement the
++"warm edges" too, but only when dragging...
++<marcopg> eliason, which reminds me... the plan is to completely drop edges at
++this point? or at least give it a try? (for the not dragging case)
++<eliason> I still think it's worth trying, but I think the general consensus
++was that we should drop it.  That's also the easier option, so for now, I
++guess it's fine.
++<marcopg> ok
++<marcopg> eliason, what should be the title of the clipboard rollover? (we are
++trying to get text objects right for now, but if you have general ideas...)
++<eliason> marcopg: Well, it would depend on what is in the clipboard.  For
++instance, if I copy some text, it should say "text clipping", or if I copy an
++image it should say "picture clipping"
++<marcopg> eliason, so [name of the object] + clipping?
++<eliason> marcopg:  If it is an activity object, it should be the name of the
++object i.e. "Eben's Shark Drawing", etc.
++<marcopg> oh ok
++<eliason> It's only a clipping if it is part of another larger context.
++<eliason> If the whole thing is an object itself, we use the object's name.
++<marcopg> eliason, I see now
++<marcopg> eliason, we want a preview of the objectm right? For text, should we
++show part of the text in the rollover?
++<eliason> marcopg: yeah, probably the first n characters of it, with an
++ellipsis at the end.
++<marcopg> eliason, on multiple lines I guess?
++<marcopg> something like, 4 lines of text on a 2 grid cells large menu, and
++ellipsize after that
++<marcopg> (the exact numbers doesn't matter, just the logic
++<eliason> marcopg:  Right.
+diff --git a/docs/release_howto.txt b/docs/release_howto.txt
+new file mode 100644
+index 0000000..841809a
+--- /dev/null
++++ b/docs/release_howto.txt
+@@ -0,0 +1,73 @@
++""" This is the release process of the sugar tarballs sugar(shell),
++sugar-toolkit and sugar-base described in a pytish way and
++instructions for sugar packagers
++"""
++
++# Release sugar tarballs
++
++for package in [sugar, sugar-toolkit, sugar-base, sugar-artwork]:
++    # Release a new version in git
++    Pull the latest sources.
++    Increase the version number in configure.ac
++    # this will create you a tarball and does a check if it builds fine
++    # e.g. it will check if all the files containing translations are
++    # in po/POTFILES.in
++    make distcheck
++
++    if that succeed:
++        # commit the change, log it as "Release [version_number]" (e.g. 0.79.1)
++        git commit -a
++        # Tag the release:
++        git tag v[version_number]
++        # Then push both the tag and the change:
++        git push --tags
++        git push
++    else:
++        break
++
++    # Upload the package
++    Upload the tarball to
++        shell.sugarlabs.org:/pub/sugarlabs/sources/sucrose/glucose/$name/$name-$version
++
++    # Verify the upload of the package
++    Check that the package has been uploaded fine: \
++        http://download.sugarlabs.org/sources/sucrose/glucose/$name/$name-$version
++
++# Package sugar for Fedora
++# - For announcements of the Sucrose release subscribe at the sugar-devel
++#   mailing list; you can filter for the [ANNOUNCE] tag
++# - Uploaded tarballs can be found at:
++#   glucose: http://download.sugarlabs.org/sources/sucrose/glucose/$name/$name-$version
++#   fructose: http://download.sugarlabs.org/sources/sucrose/fructose/$name/$name-$version
++#   more about the taxonomy: http://sugarlabs.org/go/Taxonomy
++
++# more info on fedora packaging:
++#     http://fedoraproject.org/wiki/PackageMaintainers/UpdatingPackageHowTo
++# request permissions to contribute to the fedora package:
++#     https://admin.fedoraproject.org/pkgdb/packages/name/[package]
++
++if not cvs_package:
++    # Get sugar from fedora cvs:
++    CVSROOT=:ext:erikos@cvs.fedoraproject.org:/cvs/pkgs cvs co [package]
++    cd cvs_package
++else:
++    cd cvs_package
++    cvs update
++
++cd current release
++make new-sources FILES="[tarball-created-with-make_distcheck]"
++
++# Change the version in the spec
++Bump the release number
++Edit the Changelog
++# verify your changes
++cvs diff -u
++make srpm
++
++make clog
++cvs commit -F clog
++
++make tag
++make build
++
++# Do the same for the other branches e.g. devel
+diff --git a/po/hy.po b/po/hy.po
+new file mode 100644
+index 0000000..9ee2940
+--- /dev/null
++++ b/po/hy.po
+@@ -0,0 +1,1764 @@
++# 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 "գիծ.   գույն=%s երանգ=%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 "լցնել.     գույն=%s երանգ=%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
++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 "%(interface)s: %(version)s"
++
++#: ../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 General Public արտոնագրով: Դուք "
++"կարող եք օգտագործել և տարածել այն որոշակի ներքոշյալ պայմանների ներքո:"
++
++#: ../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 "%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 "Ծածկագրի լեզուն code=%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 "Միացման Կետի Անունը (APN)."
++
++#: ../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 ""
++"Շարժական լայնաշերտ բջջային (3G) ցանցին միանալու համար ձեզ անհրաժեշտ է "
++"տրամադրել հետևյալ տեղեկությունները`:"
++
++#: ../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
++msgid "Error in specified argument use 0/1."
++msgstr "Վրիպում ընտրված տիրույթում` օգտագործել 0/1:"
++
++#: ../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 "Վրիպում ավտոմատիկ pm տիրույթում՝ օգտագործել on/off:"
++
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
++msgstr "Վրիպում արտակարգ pm տիրույթում՝ օգտագործել on/off:"
++
++#: ../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 արդիականացումը"
++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] "Արդիականացումների %s տեղադրված է"
++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 "Բեռնման չափսը. %s"
++
++#: ../extensions/cpsection/updater/view.py:364
++#, python-format
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
++msgstr "Ընթացիկ տարբերակից %(current)s դեպի նորը %(new)s (Չափս. %(size)s)"
++
++#. 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 "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 "իմ Մարտկոցը"
++
++#: ../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 "մնացել է. %(hour)d:%(min).2d"
++
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++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 "Կապուղի"
++
++#: ../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 "Վրիպում. %s"
++
++#: ../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
++msgid "%d KB"
++msgstr "%d KB"
++
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr "Ստուգեք ձեր PIN/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 "Բջջային Ցանց"
++
++#: ../extensions/deviceicon/network.py:656
++#, python-format
++msgid "Mesh Network %s"
++msgstr "Բջջային Ցանց %s"
++
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr "GSM միացումն մատչելի չէ:"
++
++#: ../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 "\"%s\" Էկրանի հանույթ"
++
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
++msgstr ""
++"\"disabled\"` որպեսզի վերահաստալ անձը; \"system\" ` որպեսզի օգտագոծել UNIX "
++"օգտվողի լրիվ անունը:"
++
++#: ../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"
++
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
++msgstr "Պաշտպանված գործունեությունների փաթեթային ID"
++
++#: ../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 ""
++"XO պատկերի գույնն այն է որ օգտագործվում է սեղանադիրում: Տողը կառուցվում XO "
++"նրբագծի և լիցքի գույներից: Գույները որոշվում են rbg ֆորմատով: Օրինակ՝ "
++"#AC32FF, #9A5200"
++
++#: ../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 "GSM ցանցի APN"
++
++#: ../data/sugar.schemas.in.h:19
++msgid "GSM network PIN"
++msgstr "GSM ցանցի PIN"
++
++#: ../data/sugar.schemas.in.h:20
++msgid "GSM network PUK"
++msgstr "GSM ցանցի PUK"
++
++#: ../data/sugar.schemas.in.h:21
++msgid "GSM network access point name configuration"
++msgstr "GSM ցանցի միացման կետի անվանման կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:22
++msgid "GSM network number"
++msgstr "GSM ցանցի համարը"
++
++#: ../data/sugar.schemas.in.h:23
++msgid "GSM network password"
++msgstr "GSM ցանցի գաղտնաբառը"
++
++#: ../data/sugar.schemas.in.h:24
++msgid "GSM network password configuration"
++msgstr "GSM ցանցի գաղտնաբառի կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:25
++msgid "GSM network personal identification number configuration"
++msgstr "GSM ցանցի անհատական անձնական համարանիշի կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:26
++msgid "GSM network personal unlock key configuration"
++msgstr "GSM ցանցի անհատական անձնական բացման եղանակի կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:27
++msgid "GSM network telephone number configuration"
++msgstr "GSM ցանցի հեռախոսային համարի կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:28
++msgid "GSM network username"
++msgstr "GSM ցանցի օգտվողի մականունը"
++
++#: ../data/sugar.schemas.in.h:29
++msgid "GSM network username configuration"
++msgstr "GSM ցանցի օգտվողի մականունի կազմաձևում"
++
++#: ../data/sugar.schemas.in.h:30
++msgid ""
++"If TRUE, Sugar will make us searchable for the other users of the Jabber "
++"server."
++msgstr ""
++"եթե TRUE է, ապա Sugar-ը Ձեզ որոնելի կդառցնի Jabber սերվերի այլ օգտվողների "
++"համար:"
++
++#: ../data/sugar.schemas.in.h:31
++msgid "If TRUE, Sugar will show a \"Log out\" option."
++msgstr "եթե TRUE է, ապա Sugar-ը կտրամադրի \"Դուրս գալ\" ընտրությունը:"
++
++#: ../data/sugar.schemas.in.h:32
++msgid "If TRUE, Sugar will show a \"Restart\" option."
++msgstr "եթե TRUE է, ապա Sugar-ը կտրամադրի \"Վերամեկնարկ\" ընտրությունը:"
++
++#: ../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 ""
++"Եթե TRUE է, ապա Sugar-ը կտրամադրի Ժամանակավոր ստեղված ցանցեր 1,6 և 11 "
++"կապուղիների համար: Եթե Sugar-ը չի գտնում \"հայտնի\" ցանցեր, նա կմիացնի Ձեզ "
++"Ժամանակավոր ցանցին:"
++
++#: ../data/sugar.schemas.in.h:34
++msgid "Jabber Server"
++msgstr "Jabber սերվեր"
++
++#: ../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 "Ցույց տալ Sugar հատուկ ցանցեր"
++
++#: ../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 "Jabber սերվերի Url հասցեն:"
++
++#: ../data/sugar.schemas.in.h:55
++msgid "Url where the backup is saved to."
++msgstr "Պահուստային պատճեների պահպանման Url հասցեն:"
++
++#: ../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 ""
++"sugar-կառավար վահանակ. ԶԳՈՒՇԱՑՈՒՄ, գտնվել է ավելի քան մեկ տարբերակ նույն "
++"անունով.%s մոդուլը.%r"
++
++#: ../src/jarabe/controlpanel/cmd.py:30
++#, python-format
++msgid "sugar-control-panel: key=%s not an available option"
++msgstr "sugar-կառավար վահանակ. key=%s անմատչելի տարբերակ"
++
++#: ../src/jarabe/controlpanel/cmd.py:31
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr "sugar-կառավար վահանակ. %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 ""
++"Օգտագործում. sugar-կառավար վահանակ [ 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"
++"    "
++
++#: ../src/jarabe/controlpanel/cmd.py:52
++msgid "To apply your changes you have to restart sugar.\n"
++msgstr "Ձեր փոփոխությունները կիրառելու համար դուք պետք է վերամեկնարկեք 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 "Զգուշացում"
++
++#: ../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 "OK"
++
++#: ../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 "Նշանակել ընտրյալը"
++
++#. 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 "%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 "WPA & WPA2 Անհատական"
++
++#: ../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 "Ժամանակավոր Ցանց %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: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 "%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 %s-ից"
++
++#: ../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 "%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 ""
++
++#: ../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 "%s ամրացում"
++
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
++msgstr "Հարևաններ"
++
++#: ../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 "Անուն."
++
++#: ../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 "Տեսակ. %s"
++
++#: ../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 "Ամսաթիվ. %s"
++
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
++msgstr "Չափս. %s"
++
++#: ../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 "Գրառման պատճենահանման վրիպում: %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.
++#: ../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 "%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: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 "%(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 ""
++"IP կոնֆիգուրացիան չի կարող հաստատվել (չկա հասանելի հասցե, ժամասպառ, և այլն):"
++
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr "IP կոնֆիգուրացիան այլևս վավեր չէ:"
++
++#: ../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 "PPP սպասարկումը թույլատրված ժամկետում չսկսեց:"
++
++#: ../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 "Չկարողացավ ընտրել տրված GSM APN-ը"
++
++#: ../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 "Չկարողացավ գրանցվել տվյալ GSM ցանցում:"
++
++#: ../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 "<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: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 "Դիտել աղբյուրը. %r"
++
++#: ../src/jarabe/util/emulator.py:40
++msgid "Sugar in a window"
++msgstr "Շաքարը պատուհանում"
+diff --git a/po/pseudo.po b/po/pseudo.po
+new file mode 100644
+index 0000000..e184567
+--- /dev/null
++++ b/po/pseudo.po
+@@ -0,0 +1,517 @@
++# 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: 2008-06-21 00:30-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.1.1rc4\n"
++
++#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
++msgid "Name:"
++msgstr ""
++
++#: ../src/intro/intro.py:94
++msgid "Click to change color:"
++msgstr ""
++
++#: ../src/intro/intro.py:145
++msgid "Back"
++msgstr ""
++
++#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
++msgid "Done"
++msgstr ""
++
++#: ../src/intro/intro.py:162
++msgid "Next"
++msgstr ""
++
++#: ../src/view/BuddyMenu.py:58
++msgid "Remove friend"
++msgstr ""
++
++#: ../src/view/BuddyMenu.py:61
++msgid "Make friend"
++msgstr ""
++
++#: ../src/view/BuddyMenu.py:91
++#, python-format
++msgid "Invite to %s"
++msgstr ""
++
++#: ../src/view/clipboardmenu.py:48
++msgid "Remove"
++msgstr ""
++
++#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
++msgid "Open"
++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"
++msgstr ""
++
++#: ../src/view/clipboardmenu.py:84
++msgid "Open with"
++msgstr ""
++
++#: ../src/view/clipboardmenu.py:212
++#, python-format
++msgid "Clipboard object: %s."
++msgstr ""
++
++#: ../src/hardware/keydialog.py:150
++msgid "Key Type:"
++msgstr ""
++
++#: ../src/hardware/keydialog.py:170
++msgid "Authentication Type:"
++msgstr ""
++
++#: ../src/hardware/keydialog.py:251
++msgid "Encryption Type:"
++msgstr ""
++
++#: ../src/view/Shell.py:262
++msgid "Screenshot"
++msgstr ""
++
++#: ../src/view/home/HomeBox.py:147
++msgid "List view"
++msgstr ""
++
++#: ../src/view/home/HomeBox.py:148
++msgid "<Ctrl>L"
++msgstr ""
++
++#: ../src/view/home/HomeBox.py:204
++msgid "Favorites view"
++msgstr ""
++
++#: ../src/view/home/HomeBox.py:205
++msgid "<Ctrl>R"
++msgstr ""
++
++#. TRANS: label for the freeform layout in the favorites view
++#: ../src/view/home/HomeBox.py:211
++msgid "Freeform"
++msgstr ""
++
++#. TRANS: label for the ring layout in the favorites view
++#: ../src/view/home/HomeBox.py:218
++msgid "Ring"
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:97
++msgid "Connect"
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:106
++msgid "Disconnect"
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:118
++msgid "Disconnecting..."
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:152
++msgid "Connecting..."
++msgstr ""
++
++#. TODO: show the channel number
++#: ../src/view/home/MeshBox.py:159
++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 ""
++
++#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
++#: ../src/view/devices/network/mesh.py:86
++msgid "Disconnect..."
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
++msgid "Resume"
++msgstr ""
++
++#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
++msgid "Join"
++msgstr ""
++
++#: ../src/view/devices/battery.py:42
++msgid "My Battery"
++msgstr ""
++
++#: ../src/view/devices/battery.py:111
++msgid "Charging"
++msgstr ""
++
++#: ../src/view/devices/battery.py:114
++msgid "Very little power remaining"
++msgstr ""
++
++#: ../src/view/devices/battery.py:120
++#, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr ""
++
++#: ../src/view/devices/battery.py:124
++msgid "Charged"
++msgstr ""
++
++#: ../src/view/devices/speaker.py:40
++msgid "My Speakers"
++msgstr ""
++
++#: ../src/view/devices/speaker.py:104
++msgid "Unmute"
++msgstr ""
++
++#: ../src/view/devices/speaker.py:107
++msgid "Mute"
++msgstr ""
++
++#: ../src/view/devices/network/wireless.py:64
++msgid "Disconnected"
++msgstr ""
++
++#: ../src/view/devices/network/wireless.py:134
++msgid "Channel"
++msgstr ""
++
++#: ../src/view/frame/zoomtoolbar.py:34
++msgid "Neighborhood"
++msgstr ""
++
++#: ../src/view/frame/zoomtoolbar.py:36
++msgid "Group"
++msgstr ""
++
++#: ../src/view/frame/zoomtoolbar.py:38
++msgid "Home"
++msgstr ""
++
++#: ../src/view/frame/zoomtoolbar.py:40
++msgid "Activity"
++msgstr ""
++
++#: ../src/controlpanel/cmd.py:26
++#, 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
++#, python-format
++msgid "sugar-control-panel: key=%s not an available option"
++msgstr ""
++
++#: ../src/controlpanel/cmd.py:29
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr ""
++
++#: ../src/controlpanel/cmd.py:33
++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"
++"    "
++msgstr ""
++
++#: ../src/controlpanel/cmd.py:45
++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"
++msgstr ""
++
++#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
++msgid "Changes require restart"
++msgstr ""
++
++#: ../src/controlpanel/gui.py:249
++msgid "Warning"
++msgstr ""
++
++#: ../src/controlpanel/gui.py:253
++msgid "Cancel changes"
++msgstr ""
++
++#: ../src/controlpanel/gui.py:257
++msgid "Later"
++msgstr ""
++
++#: ../src/controlpanel/gui.py:261
++msgid "Restart now"
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:44
++msgid "You must enter a name."
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:67
++#, python-format
++msgid "stroke:   color=%s hue=%s"
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:70
++#, python-format
++msgid "stroke:   %s"
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:72
++#, python-format
++msgid "fill:     color=%s hue=%s"
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:74
++#, python-format
++msgid "fill:     %s"
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:85
++msgid "Error in specified color modifiers."
++msgstr ""
++
++#: ../src/controlpanel/model/aboutme.py:88
++msgid "Error in specified colors."
++msgstr ""
++
++#: ../src/controlpanel/model/aboutxo.py:24
++msgid "Not available"
++msgstr ""
++
++#: ../src/controlpanel/model/datetime.py:85
++msgid "Error timezone does not exist."
++msgstr ""
++
++#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
++msgid "Value must be an integer."
++msgstr ""
++
++#: ../src/controlpanel/model/language.py:28
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr ""
++
++#: ../src/controlpanel/model/language.py:104
++#, python-format
++msgid "Language for code=%s could not be determined."
++msgstr ""
++
++#: ../src/controlpanel/model/language.py:121
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr ""
++
++#: ../src/controlpanel/model/network.py:48
++msgid "You must enter a server."
++msgstr ""
++
++#: ../src/controlpanel/model/network.py:63
++msgid "State is unknown."
++msgstr ""
++
++#: ../src/controlpanel/model/network.py:83
++msgid "Error in specified radio argument use on/off."
++msgstr ""
++
++#: ../src/controlpanel/view/aboutme.py:32
++msgid "About Me"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutme.py:134
++msgid "Click to change your color:"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:26
++msgid "About my XO"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:47
++msgid "Identity"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:56
++msgid "Serial Number:"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:79
++msgid "Software"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:88
++msgid "Build:"
++msgstr ""
++
++#: ../src/controlpanel/view/aboutxo.py:103
++msgid "Firmware:"
++msgstr ""
++
++#: ../src/controlpanel/view/datetime.py:29
++msgid "Date & Time"
++msgstr ""
++
++#: ../src/controlpanel/view/datetime.py:72
++msgid "Timezone"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:28
++msgid "Frame"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:30
++msgid "never"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:31
++msgid "instantaneous"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:32
++#, python-format
++msgid "%s seconds"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:56
++msgid "Activation Delay"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:80
++msgid "Corner"
++msgstr ""
++
++#: ../src/controlpanel/view/frame.py:115
++msgid "Edge"
++msgstr ""
++
++#: ../src/controlpanel/view/language.py:29
++#: ../src/controlpanel/view/language.py:74
++msgid "Language"
++msgstr ""
++
++#: ../src/controlpanel/view/network.py:28
++msgid "Network"
++msgstr ""
++
++#: ../src/controlpanel/view/network.py:53
++msgid "Wireless"
++msgstr ""
++
++#: ../src/controlpanel/view/network.py:61
++msgid "Radio:"
++msgstr ""
++
++#: ../src/controlpanel/view/network.py:94
++msgid "Mesh"
++msgstr ""
++
++#: ../src/controlpanel/view/network.py:103
++msgid "Server:"
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:108
++msgid "Connected to a School Mesh Portal"
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:110
++msgid "Looking for a School Mesh Portal..."
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:113
++msgid "Connected to an XO Mesh Portal"
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:115
++msgid "Looking for an XO Mesh Portal..."
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:118
++msgid "Connected to a Simple Mesh"
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:120
++msgid "Starting a Simple Mesh"
++msgstr ""
++
++#: ../src/view/devices/network/mesh.py:127
++msgid "Unknown Mesh"
++msgstr ""
++
++#: ../src/view/frame/activitiestray.py:224
++msgid "Decline"
++msgstr ""
++
++#: ../src/view/home/favoritesview.py:351
++msgid "Control Panel"
++msgstr ""
++
++#: ../src/view/home/favoritesview.py:362
++msgid "Restart"
++msgstr ""
++
++#: ../src/view/home/favoritesview.py:367
++msgid "Shutdown"
++msgstr ""
++
++#: ../src/view/home/favoritesview.py:373
++msgid "Register"
++msgstr ""
++
++#: ../src/view/palettes.py:41
++msgid "Starting..."
++msgstr ""
++
++#: ../src/view/palettes.py:71
++msgid "Stop"
++msgstr ""
++
++#: ../src/view/palettes.py:96
++msgid "Start"
++msgstr ""
++
++#: ../src/view/palettes.py:119
++msgid "Remove favorite"
++msgstr ""
++
++#: ../src/view/palettes.py:123
++msgid "Make favorite"
++msgstr ""
++
++#: ../src/view/palettes.py:169
++msgid "Show contents"
++msgstr ""
++
++#: ../src/view/palettes.py:193
++#, python-format
++msgid "%(free_space)d MB Free"
++msgstr ""
+diff --git a/src/jarabe/.gitignore b/src/jarabe/.gitignore
+new file mode 100644
+index 0000000..4acd06b
+--- /dev/null
++++ b/src/jarabe/.gitignore
+@@ -0,0 +1 @@
++config.py
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0001-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch b/rpms/sugar/0001-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch
new file mode 100644
index 0000000..e97ed18
--- /dev/null
+++ b/rpms/sugar/0001-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch
@@ -0,0 +1,36 @@
+From 8eb6a1d751038e94eb520fb29224f9082f0aab80 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 19 Oct 2011 14:35:09 +0200
+Subject: [PATCH sugar 01/74] Commit from Sugar Labs: Translation System by
+ user godiard.: 379 of 379 messages translated
+ (0 fuzzy).
+
+---
+ po/es.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/po/es.po b/po/es.po
+index dd798d7..83b28d3 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -27,7 +27,7 @@ msgstr ""
+ "Project-Id-Version: olpc-sugar\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2011-09-23 11:55-0400\n"
+-"PO-Revision-Date: 2011-09-27 12:44+0200\n"
++"PO-Revision-Date: 2011-10-19 14:33+0200\n"
+ "Last-Translator: Gonzalo <godiard@sugarlabs.org>\n"
+ "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
+ "Language: es\n"
+@@ -1793,7 +1793,7 @@ msgstr "Mostrar contenidos"
+ #: ../src/jarabe/view/palettes.py:229
+ msgctxt "Volume"
+ msgid "Remove"
+-msgstr "Eliminar"
++msgstr "Quitar"
+ 
+ #: ../src/jarabe/view/viewsource.py:263
+ msgid "Instance Source"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0002-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch b/rpms/sugar/0002-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch
new file mode 100644
index 0000000..32ec81d
--- /dev/null
+++ b/rpms/sugar/0002-Commit-from-Sugar-Labs-Translation-System-by-user-go.patch
@@ -0,0 +1,128363 @@
+From 717c7d9539b5ec7b4ffcf8fad241cdc5ad9a0195 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 19 Oct 2011 14:48:49 +0200
+Subject: [PATCH sugar 02/74] Commit from Sugar Labs: Translation System by
+ user godiard.: 379 of 379 messages translated
+ (0 fuzzy).
+
+---
+ po/af.po        | 1938 +++++++++++++++++++++++++++++++++++++++++---------
+ po/am.po        | 1740 +++++++++++++++++++++++++++++++++++++++------
+ po/ay.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/aym.po       | 2121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/bg.po        | 2072 +++++++++++++++++++++++++++++++++++++++++++++--------
+ po/bi.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/bn_IN.po     | 2070 +++++++++++++++++++++++++++++++++++++++++++++--------
+ po/ca.po        | 2107 ++++++++++++++++++++++++++++++++++++++++++++++---------
+ po/cpp.po       | 1329 +++++++++++++++++++++++++++--------
+ po/cs.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/dz.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/el.po        |   14 +-
+ po/en_GB.po     | 1758 +++++++++++++++++++++++++++++++++++++++++++++
+ po/en_US.po     | 1758 +++++++++++++++++++++++++++++++++++++++++++++
+ po/eu.po        | 1713 ++++++++++++++++++++++++++++++++++++++++++++
+ po/fa.po        | 2063 +++++++++++++++++++++++++++++++++++++++++++++--------
+ po/fa_AF.po     | 2070 +++++++++++++++++++++++++++++++++++++++++++++--------
+ po/ff.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/fil.po       | 1329 +++++++++++++++++++++++++++--------
+ po/fr.po        |   10 +-
+ po/gu.po        | 1706 +++++++++++++++++++++++++++++++++++++++-----
+ po/ha.po        | 1733 ++++++++++++++++++++++++++++++++++++++------
+ po/he.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/hi.po        | 1168 +++++++++++++++++++++---------
+ po/ht.po        | 1904 ++++++++++++++++++++++++++++++++++++++++---------
+ po/hu.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/hus.po       | 1845 +++++++++++++++++++++++++++++++++++++++++++++++
+ po/id.po        | 1329 +++++++++++++++++++++++++++--------
+ po/ig.po        | 1733 ++++++++++++++++++++++++++++++++++++++------
+ po/is.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/km.po        | 1900 ++++++++++++++++++++++++++++++++++++++++---------
+ po/ko.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/kos.po       | 1157 +++++++++++++++++++++---------
+ po/mg.po        | 1172 ++++++++++++++++++++++---------
+ po/mi.po        | 1314 ++++++++++++++++++++++++++--------
+ po/mk.po        | 1801 ++++++++++++++++++++++++++++++++++++++++------
+ po/ml.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/ms.po        | 1329 +++++++++++++++++++++++++++--------
+ po/mvo.po       | 1706 +++++++++++++++++++++++++++++++++++++-------
+ po/nb.po        | 2078 ++++++++++++++++++++++++++++++++++++++++++------------
+ po/pa.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/pap.po       | 1869 +++++++++++++++++++++++++++++++++++++++---------
+ po/pis.po       | 1706 +++++++++++++++++++++++++++++++++++++-------
+ po/ps.po        | 2079 +++++++++++++++++++++++++++++++++++++++++++++--------
+ po/pt_BR.po     |   49 +-
+ po/qqa.po       | 2140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/qu.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/quy.po       | 2140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/quz.po       | 2125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ro.po        | 1875 ++++++++++++++++++++++++++++++++++++++++++-------
+ po/rw.po        |   49 +-
+ po/sd.po        | 1706 +++++++++++++++++++++++++++++++++++++-------
+ po/sk.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/sl.po        | 1379 +++++++++++++++++++++++++++---------
+ po/sv.po        | 1230 +++++++++++++++++++++++---------
+ po/te.po        | 2087 ++++++++++++++++++++++++++++++++++++++++++------------
+ po/templates.po | 1713 ++++++++++++++++++++++++++++++++++++++++++++
+ po/th.po        | 1697 ++++++++++++++++++++++++++++++++++++++------
+ po/tpi.po       | 1706 +++++++++++++++++++++++++++++++++++++-------
+ po/tr.po        | 2145 ++++++++++++++++++++++++++++++++++++++++---------------
+ po/tvl.po       | 1125 +++++++++++++++++++++--------
+ po/tzo.po       | 1155 +++++++++++++++++++++---------
+ po/ug.po        | 1314 ++++++++++++++++++++++++++--------
+ po/ur.po        | 2043 +++++++++++++++++++++++++++++++++++++++++-----------
+ po/wa.po        | 1745 ++++++++++++++++++++++++++++++++++----------
+ po/yo.po        | 1733 ++++++++++++++++++++++++++++++++++++++------
+ po/zh_CN.po     | 2084 +++++++++++++++++++++++++++++++++++++++++++++--------
+ 67 files changed, 92949 insertions(+), 16213 deletions(-)
+ create mode 100644 po/aym.po
+ create mode 100644 po/en_GB.po
+ create mode 100644 po/en_US.po
+ create mode 100644 po/eu.po
+ create mode 100644 po/hus.po
+ create mode 100644 po/qqa.po
+ create mode 100644 po/quy.po
+ create mode 100644 po/quz.po
+ create mode 100644 po/templates.po
+
+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,505 +15,1753 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Pootle 1.1.0rc2\n"
+ 
+-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
++#: ../extensions/cpsection/aboutme/__init__.py:24
++msgid "About Me"
++msgstr "Omtrent My"
++
++#: ../extensions/cpsection/aboutme/model.py:48
++msgid "You must enter a name."
++msgstr "Jy moet 'n naam inskryf."
++
++#: ../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 "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 ""
++
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr "Nie beskikbaar nie"
++
++#: ../extensions/cpsection/aboutcomputer/model.py:171
++#, python-format
++msgid "%(interface)s: %(version)s"
++msgstr ""
++
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr "Identiteit"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr "Seriële Nommer:"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr "Sagteware"
++
++#: ../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"
++
++#: ../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 "%s seconds"
++msgstr "%s sekondes"
++
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr "Aktiveerings Vertraging"
++
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr "Hoekie"
++
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr "Snykant"
++
++#: ../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 "Taal"
++
++#: ../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 "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 ""
++
++#: ../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 "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 ""
++
++#. 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 ""
++
++#: ../extensions/deviceicon/battery.py:147
++#, fuzzy
++msgid "Removed"
++msgstr "Verwyder"
++
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr "Baie min krag oor"
++
++#: ../extensions/deviceicon/battery.py:158
++#, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr "%(hour)d:%(min).2d oor"
++
++#: ../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 "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 ""
++
++#: ../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 "Groep"
++
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Tuis"
++
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Aktiwiteit"
++
++#: ../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 "Om jou veranderings te gebruik moet jy sugar herbegin.\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 "Waarskuwing"
++
++#: ../src/jarabe/controlpanel/gui.py:297
++#: ../src/jarabe/controlpanel/sectionview.py:41
++msgid "Changes require restart"
++msgstr "Veranderings het herbegin nodig"
++
++#: ../src/jarabe/controlpanel/gui.py:300
++msgid "Cancel changes"
++msgstr "Kanselleer veranderings"
++
++#: ../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 "Herbegin nou"
++
++#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
++msgid "Done"
++msgstr "Klaar"
++
++#: ../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 "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 "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 "%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 ""
++
++#. 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 "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 "Weier"
++
++#: ../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 "Verwyder"
++
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
++msgstr "Maak oop"
++
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
++msgstr "Maak oop met"
++
++#: ../src/jarabe/frame/clipboardobject.py:50
++#, python-format
++msgid "%s clipping"
++msgstr ""
++
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
++msgstr "Buurt"
++
++#: ../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 "Naam:"
+ 
+-#: ../src/intro/intro.py:94
++#: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+ msgstr "Kliek om die kleur the verander:"
+ 
+-#: ../src/intro/intro.py:145
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+ msgid "Back"
+ msgstr "Terug"
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "Klaar"
+-
+-#: ../src/intro/intro.py:162
++#: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+ msgstr "Volgende"
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-msgstr "Verwyder vriend"
++#: ../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/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "Maak vriend"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr "Geen preview"
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Invite to %s"
+-msgstr "Nooi na %s"
++msgid "Kind: %s"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
+-msgstr "Verwyder"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
+-msgstr "Maak oop"
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
++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"
+-msgstr "Hou"
++#: ../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 "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/view/clipboardmenu.py:84
+-msgid "Open with"
+-msgstr "Maak oop met"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
++#: ../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 "Clipboard object: %s."
+-msgstr "Knipbord objek: %s."
++msgid "Error while copying the entry. %s"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "Sleutel Tipe:"
++#: ../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/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "Geldigheidsverklaring Tipe:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr "Begin"
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "Enkripsie Tipe:"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
++msgstr "Jou joernaal is leeg"
++
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-msgstr "Koppel"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
+-msgstr "Ontkoppel"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
+-msgstr "Ontkoppel..."
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
++msgstr "Jou joernaal is leeg"
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
+-msgstr "Koppel..."
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
+-msgstr "Gekoppel"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
++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"
++#: ../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/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
+-#: ../src/view/devices/network/mesh.py:86
+-msgid "Disconnect..."
+-msgstr "Ontkoppel..."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
+-msgstr "Aangaan"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
+-msgstr "Aansluit"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
+-msgstr "Baie min krag oor"
++#: ../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/view/devices/battery.py:120
+-#, python-format
+-msgid "%(hour)d:%(min).2d remaining"
+-msgstr "%(hour)d:%(min).2d oor"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
+-msgstr "Ontkoppel"
++#: ../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/view/devices/network/wireless.py:134
+-msgid "Channel"
+-msgstr "Kanaal"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "Buurt"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "Groep"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "Tuis"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "Aktiwiteit"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
+-#, python-format
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
+-#, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
++#: ../src/jarabe/model/network.py:180
+ 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"
+-"    "
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "Om jou veranderings te gebruik moet jy sugar herbegin.\n"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "Kanselleer"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
+-msgstr "Reg"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
++msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
+-msgstr "Veranderings het herbegin nodig"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:249
+-msgid "Warning"
+-msgstr "Waarskuwing"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
+-msgstr "Kanselleer veranderings"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
+-msgstr "Later"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
+-msgstr "Herbegin nou"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
+-msgstr "Jy moet 'n naam inskryf."
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     %s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:88
+-msgid "Error in specified colors."
+-msgstr "Vout in gespesifiseerde kleure."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "Nie beskikbaar nie"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "Jammer, ek praat nie '%s'."
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
+-msgstr "Jy moet 'n bediener inskryf."
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ 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/model/network.py:230
++msgid "Network registration timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
+-msgstr "Omtrent My"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
+-msgstr "Kliek om jou kleur te verander:"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
+-msgstr "Omtrent my XO"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
+-msgstr "Identiteit"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
+-msgstr "Seriële Nommer:"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
+-msgstr "Sagteware"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
+-msgstr "Bou:"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
+-msgstr "Fermware:"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
+-msgstr "Datem & Tyd"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "Verwyder vriend"
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
+-msgstr "Tydsone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "Maak vriend"
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
+-msgstr "Raam"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "Uitskakel"
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
+-msgstr "nooit"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
++msgstr "Herbegin"
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
+-msgstr "dadelik"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
++msgstr ""
++
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
++#: ../src/jarabe/view/buddymenu.py:142
+ #, python-format
+-msgid "%s seconds"
+-msgstr "%s sekondes"
++msgid "Invite to %s"
++msgstr "Nooi na %s"
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
+-msgstr "Aktiveerings Vertraging"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
+-msgstr "Hoekie"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
++msgstr "Begin..."
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
+-msgstr "Snykant"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
+-msgstr "Taal"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
+-msgstr "Netwerk"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
++msgstr "Stop"
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
+-msgstr "Draadloos"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
+-msgstr "Radio:"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
++msgstr "Wys inhoud"
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
+-msgstr ""
++#: ../src/jarabe/view/palettes.py:229
++#, fuzzy
++msgctxt "Volume"
++msgid "Remove"
++msgstr "Verwyder"
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
+-msgstr "Bediener:"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Aan 'n Skool Mesh Portal gekoppel"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
++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/view/viewsource.py:374
++msgid "Activity Bundle Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "Aan 'n XO Mesh Portal gekoppel"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "Op soek na 'n XO Mesh Portal..."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
+-msgstr "Aan Eenvoudig Mesh gekoppel"
++#: ../src/jarabe/util/emulator.py:40
++msgid "Sugar in a window"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
+-msgstr "Begin 'n Eenvoidige Mesh"
++#, python-format
++#~ msgid "Clipboard object: %s."
++#~ msgstr "Knipbord objek: %s."
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
+-msgstr "Vreemde Mesh"
++#~ msgid "Encryption Type:"
++#~ msgstr "Enkripsie Tipe:"
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
+-msgstr "Weier"
++#~ msgid "Disconnecting..."
++#~ msgstr "Ontkoppel..."
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
+-msgstr "Kontrole Paneel"
++#~ msgid "Disconnect..."
++#~ msgstr "Ontkoppel..."
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
+-msgstr "Herbegin"
++#~ msgid "You must enter a server."
++#~ msgstr "Jy moet 'n bediener inskryf."
+ 
+-#: ../src/view/home/favoritesview.py:367
+-msgid "Shutdown"
+-msgstr "Uitskakel"
++#~ msgid "About my XO"
++#~ msgstr "Omtrent my XO"
+ 
+-#: ../src/view/home/favoritesview.py:373
+-msgid "Register"
+-msgstr "Registreer"
++#~ msgid "Connected to a School Mesh Portal"
++#~ msgstr "Aan 'n Skool Mesh Portal gekoppel"
+ 
+-#: ../src/view/palettes.py:41
+-msgid "Starting..."
+-msgstr "Begin..."
++#~ msgid "Looking for a School Mesh Portal..."
++#~ msgstr "Op soek na 'n Skool Mesh Portal..."
+ 
+-#: ../src/view/palettes.py:71
+-msgid "Stop"
+-msgstr "Stop"
++#~ msgid "Connected to an XO Mesh Portal"
++#~ msgstr "Aan 'n XO Mesh Portal gekoppel"
+ 
+-#: ../src/view/palettes.py:96
+-msgid "Start"
+-msgstr "Begin"
++#~ msgid "Looking for an XO Mesh Portal..."
++#~ msgstr "Op soek na 'n XO Mesh Portal..."
+ 
+-#: ../src/view/palettes.py:119
+-msgid "Remove favorite"
+-msgstr ""
++#~ msgid "Connected to a Simple Mesh"
++#~ msgstr "Aan Eenvoudig Mesh gekoppel"
+ 
+-#: ../src/view/palettes.py:123
+-msgid "Make favorite"
+-msgstr ""
++#~ msgid "Starting a Simple Mesh"
++#~ msgstr "Begin 'n Eenvoidige Mesh"
+ 
+-#: ../src/view/palettes.py:169
+-msgid "Show contents"
+-msgstr "Wys inhoud"
++#~ msgid "Unknown Mesh"
++#~ msgstr "Vreemde Mesh"
+ 
+-#: ../src/view/palettes.py:193
+-#, python-format
+-msgid "%(free_space)d MB Free"
+-msgstr ""
++#~ 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 ""
++
++#: ../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 "ማንነት"
++
++#: ../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
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
++#: ../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 ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
++#: ../extensions/cpsection/aboutcomputer/view.py:200
++msgid "Full license:"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
++#: ../extensions/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++msgstr "ቀንና ሠዐት"
++
++#: ../extensions/cpsection/datetime/model.py:92
++msgid "Error timezone does not exist."
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
++#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
++msgid "Timezone"
++msgstr "የሰዓት ክልል"
++
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
++msgid "Value must be an integer."
+ msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr "በፍጹም"
++
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format
++msgid "%s seconds"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:164
+-msgid "Shutdown"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:170
+-msgid "Register"
++#: ../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 ""
+ 
+-#. 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/keyboard/view.py:190
++msgid "Keyboard Model"
+ 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/keyboard/view.py:250
++msgid "Key(s) to change layout"
+ msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
++#: ../extensions/cpsection/keyboard/view.py:319
++msgid "Keyboard Layout(s)"
+ msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:38
+-msgid "My Battery life"
++#: ../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/devices/battery.py:94
+-msgid "Battery charging"
++#: ../extensions/cpsection/language/model.py:129
++#, python-format
++msgid "Language for code=%s could not be determined."
+ msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:96
+-msgid "Battery discharging"
++#: ../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/devices/battery.py:98
+-msgid "Battery fully charged"
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../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/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../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/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../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/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../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:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/updater/view.py:125
++#, python-format
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/updater/view.py:127
++#, python-format
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/view.py:129
++#, python-format
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d year"
++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/objectchooser.py:175
+-#, python-format
+-msgid "%d years"
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:173
+ #, python-format
+-msgid "%d month"
++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:176
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d months"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d week"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#. 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/graphics/objectchooser.py:178
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d day"
++msgid "%.0f KB"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
+ #, python-format
+-msgid "%d days"
++msgid "%.1f MB"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../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 "%d hour"
++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 ""
++
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../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 "ስህተት :%s"
++
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "%d hours"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "%d minute"
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "%d minutes"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "%d second"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "%d seconds"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../data/sugar.schemas.in.h:9
++msgid "Default nick"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../data/sugar.schemas.in.h:10
++msgid "Delay for the activation of the frame using the corners."
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../data/sugar.schemas.in.h:11
++msgid "Delay for the activation of the frame using the edges."
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
++#: ../data/sugar.schemas.in.h:12
++msgid "Directory to search for translations"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
+-#, python-format
+-msgid "Changing permission of timezone: %s"
++#: ../data/sugar.schemas.in.h:13
++msgid "Edge Delay"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../data/sugar.schemas.in.h:14
++msgid "Favorites Layout"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+-#, python-format
+-msgid "Could not access %s. Create standard settings."
++#: ../data/sugar.schemas.in.h:15
++msgid "Favorites resume mode"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../data/sugar.schemas.in.h:16
++msgid "Font face that is used throughout the desktop."
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../data/sugar.schemas.in.h:17
++msgid "Font size that is used throughout the desktop."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:18
++msgid "GSM network APN"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:19
++msgid "GSM network PIN"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:20
++msgid "GSM network PUK"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:21
++msgid "GSM network access point name configuration"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
++#: ../data/sugar.schemas.in.h:22
++msgid "GSM network number"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:23
++msgid "GSM network password"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:24
++msgid "GSM network password configuration"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:25
++msgid "GSM network personal identification number configuration"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 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 ""
++
++#. 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 "%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 "ቀጥል"
++
++#: ../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 "%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 ""
++
++#: ../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 "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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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,421 +15,891 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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 "Затваряне"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. 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 ""
++
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "Без свързаност"
++
++#: ../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:401
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "Грешка при копиране на времева зона (от %s): %s"
++#: ../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"
+-msgstr "Замяна на позволенията за времева зона: %s"
+-
+-#: ../src/controlpanel/control.py:416
+-msgid "Error timezone does not exist."
+-msgstr "Грешка, времевата зона не съществува."
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/control.py:421 ../src/controlpanel/control.py:440
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "Отказан е достъп до %s. Моля, създайте стандартни настойки."
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/control.py:467
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "Не може да бъде определен езикът с код=%s."
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/control.py:477
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "Съжалявам, но не говоря '%s'."
++msgid "%d KB"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Свързан към училищният Mash портал"
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "Търсене на училищем Mesh портал..."
++#: ../extensions/deviceicon/network.py:364
++msgid "Check your Access Point Name (APN) configuration"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "Свързан към Mesh мрежа от лаптопи XO"
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "Търсене на Mesh мрежа от лаптопи XO..."
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "Свързан към обикновенна Mesh мрежа"
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "Mesh мрежа"
+ 
+-#: ../src/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "Стартиране на обикновенна Mesh мрежа"
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "Mesh мрежа"
+ 
+-#: ../src/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "Непозната Mesh мрежа"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:175 ../src/view/home/HomeBox.py:216
+-msgid "About this XO"
+-msgstr "Относно този лаптоп"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:222
+-msgid "Not available"
+-msgstr "Не е наличен"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:27
+-msgid ""
+-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+-"    Control for the sugar environment. \n"
++#: ../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 "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"
+ "    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 [ опции ] ключ [ аргументи ... ] \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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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:"
+-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 "উল্লেখিত রং পরিবর্তকে ত্রুটি।"
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "%s কে নিমণ্ত্রণ"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr "উল্লেখিত রং এ ত্রুটি।"
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "মোছো"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "রং পরিবর্তন করতে ক্লিক:"
+ 
+-#: ../shell/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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "জার্নালে লেখ"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr "পাওয়া যায় নি"
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "ক্লীপবোর্ড বস্তু: %s।"
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "কী ধরণ:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "পরিচয় প্রমানের ধরণ:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "এনক্রিপশন ধরণ:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "শুরু হচ্ছে..."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "পুনরায় শুরু করুন"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "থামাও"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "স্ক্রীণশট"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "পুনরায় চালু"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/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
+-#: ../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 "মেশ নেটওয়ার্ক"
++#: ../extensions/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-msgstr "যোগ দাও"
++#: ../extensions/cpsection/datetime/model.py:92
++msgid "Error timezone does not exist."
++msgstr "ত্রুটিযুক্ত সময় জোনের অস্তিত্ব নেই।"
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "ব্যাটারী চার্জ হচ্ছে"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "ব্যাটারী পুরোপুরি চার্জ হয়েছে"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
+-msgstr "সংযোগ বিচ্ছিন্ন"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "চ্যানেল"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format, fuzzy
++msgid "%s seconds"
++msgstr "%d সেকেন্ড"
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "ছোটবেলা"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-msgstr "দল"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "বাড়ি"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr ""
+ 
+-#: ../shell/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 "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার on/off তে ত্রুটি।"
+ 
+-#: ../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 "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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 "করা হয়েছে"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. 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 ""
++
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "উল্লেখিত রং পরিবর্তকে ত্রুটি।"
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "উল্লেখিত রং এ ত্রুটি।"
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
++msgstr "চ্যানেল"
++
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "off"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "on"
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "অবস্থানটি অজানা।"
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
+-msgstr "উল্লেখিত রেডিও প্রেরিত মান ব্যবহার on/off তে ত্রুটি।"
++#: ../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/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
+-msgstr "অনুমতি প্রত্যাখ্যাত। এই পন্থাটি চালাতে তোমাকে root হিসেবে কাজ করতে হবে।"
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
++msgstr "সংযোগ বিচ্ছিন্ন"
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-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/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "সময় জোন (%s হতে) কপি করায় ত্রুটি: %s"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "সময় জোনের অনুমতি পরিবর্তন: %s"
+-
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "ত্রুটিযুক্ত সময় জোনের অস্তিত্ব নেই।"
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "%s এ প্রবেশ করতে পারে নি। প্রমাণ মানসমূহ তৈরি করো।"
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "কোড=%s এর জন্য কোন ভাষা নির্ধারণ করা যায় নি।"
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "দুঃখিত আমি '%s' বলতে পারি না।"
++msgid "%d KB"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-msgstr "একটি স্কুলের মেশ পোর্টালে সংযুক্ত"
++#: ../extensions/deviceicon/network.py:364
++msgid "Check your Access Point Name (APN) configuration"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "একটি স্কুল মেশ পোর্টাল খুজছি..."
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "একটি জো(XO) মেশ পোর্টালে সংযুক্ত"
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "একটি জো(XO) মেশ পোর্টাল খুজছি..."
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "মেশ নেটওয়ার্ক"
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "একটি সাধারণ মেশ এ সংযুক্ত"
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "মেশ নেটওয়ার্ক"
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "একটি সাধারণ মেশ চালু করছি"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "অজানা মেশ"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
+-msgstr "XO সম্বন্ধে"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
+-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 "তোমার পরিবর্তন কার্যকর করার জন্য সুগার পুনরায় চালু করতে হবে।\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 ""
++
++#: ../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, 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 "%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 "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:"
+-msgstr "Clic per a canviar de color:"
++#: ../extensions/cpsection/aboutme/model.py:48
++msgid "You must enter a name."
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:146
+-msgid "Back"
+-msgstr "Enrere"
++#: ../extensions/cpsection/aboutme/model.py:75
++#, python-format
++msgid "stroke:   color=%s hue=%s"
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:160
+-msgid "Done"
+-msgstr "Fet"
++#: ../extensions/cpsection/aboutme/model.py:78
++#, python-format
++msgid "stroke:   %s"
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:163
+-msgid "Next"
+-msgstr "Següent"
++#: ../extensions/cpsection/aboutme/model.py:80
++#, python-format
++msgid "fill:     color=%s hue=%s"
++msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:59
+-msgid "Remove friend"
+-msgstr "Esborrar amic/ga"
++#: ../extensions/cpsection/aboutme/model.py:82
++#, python-format
++msgid "fill:     %s"
++msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:62
+-msgid "Make friend"
+-msgstr "Fer amic/ga"
++#: ../extensions/cpsection/aboutme/model.py:94
++msgid "Error in specified color modifiers."
++msgstr "Error en els modificadors de color especificats"
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "Convidar a %s"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr "Error en els colors especificats"
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "Eliminar"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "Clic per a canviar de color:"
+ 
+-#: ../shell/view/clipboardmenu.py:63
+-msgid "Open"
+-msgstr "Obrir"
++#: ../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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "Afegir al diari"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr "No disponible"
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "Objecte del porta-retalls: %s"
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "Tipus de clau:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "Tipus d'autentificació:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "Tipus d'encriptació:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "Arrencant ..."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "Reprendre"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "Aturar"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "Captura de pantalla"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "Reiniciar"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:164
+-msgid "Shutdown"
+-msgstr "Aturar"
++#: ../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 ""
+ 
+-#: ../shell/view/home/HomeBox.py:170
+-msgid "Register"
+-msgstr "Registre"
++#: ../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
+-#: ../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/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++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
+-#, fuzzy
+-msgid "Mesh Network"
+-msgstr "Xarxa Mesh"
++#: ../extensions/cpsection/datetime/model.py:92
++msgid "Error timezone does not exist."
++msgstr "Error: aquesta zona horària no existeix"
+ 
+-# mmm, potser més simple?
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-msgstr "Uneix-t'hi"
++#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
++msgid "Timezone"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:38
+-msgid "My Battery life"
+-msgstr "Vida de la bateria"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "Carregant bateria"
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
++msgid "Value must be an integer."
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:96
+-msgid "Battery discharging"
+-msgstr "Descarregant bateria"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "Bateria plena"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
+-msgstr "Desconnectat"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format, fuzzy
++msgid "%s seconds"
++msgstr "%d segons"
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "Canal"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr ""
+ 
+-# aquí cal pensar si es millorÑ barri, veinatge, maquines veines,....
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "Veïns"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-msgstr "Grup"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "Inici"
++#: ../extensions/cpsection/keyboard/__init__.py:21
++#: ../extensions/cpsection/keyboard/view.py:32
++msgid "Keyboard"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
+-msgstr "Activitat"
++#: ../extensions/cpsection/keyboard/view.py:190
++msgid "Keyboard Model"
++msgstr ""
++
++#: ../extensions/cpsection/keyboard/view.py:250
++msgid "Key(s) to change layout"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
+-msgstr "Compartir amb:"
++#: ../extensions/cpsection/keyboard/view.py:319
++msgid "Keyboard Layout(s)"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
+-msgstr "Privat"
++#: ../extensions/cpsection/language/__init__.py:21
++#: ../extensions/cpsection/language/view.py:33
++msgid "Language"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
+-msgstr "Els meus veïns"
++#: ../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."
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/language/model.py:129
++#, 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."
++
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
+-msgstr "Desfer"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
+-msgstr "Refer"
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
+-msgstr "Copia"
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
+-msgstr "Enganxa"
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
+-msgstr "%s Activitat"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
++msgstr ""
+ 
+-# revisar
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
+-msgstr "Manté l'error"
++#: ../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"
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
+-msgstr "Manté l'error: tots els canvis es perdran"
++#  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"
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
+-msgstr "No t'aturis"
++# 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"
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
+-msgstr "Cancel·lar"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
+-msgstr "D'acord"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
+-msgstr "Continuar"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
+-msgstr "D'acord"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d year"
+-msgstr "%d any"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d years"
+-msgstr "%d anys"
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d month"
+-msgstr "%d mes"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
+-msgstr "%d mesos"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
+-#, python-format
+-msgid "%d week"
+-msgstr "%d setmana"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
+-msgstr "%d setmanes"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
+-#, python-format
+-msgid "%d day"
+-msgstr "%d dia"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
+-#, python-format
+-msgid "%d days"
+-msgstr "%d dies"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hour"
+-msgstr "%d hora"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../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 hours"
+-msgstr "%d hores"
++msgid "Checking %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d minute"
+-msgstr "%d minut"
++msgid "Downloading %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d minutes"
+-msgstr "%d minuts"
++msgid "Updating %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
++msgstr ""
++
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d second"
+-msgstr "%d segon"
++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/objectchooser.py:181
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
++msgstr ""
++
++#: ../extensions/cpsection/updater/view.py:173
+ #, python-format
+-msgid "%d seconds"
+-msgstr "%d segons"
++msgid "%s update was installed"
++msgid_plural "%s updates were installed"
++msgstr[0] ""
++msgstr[1] ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
+-msgstr "i"
++#: ../extensions/cpsection/updater/view.py:255
++msgid "Install selected"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
+-msgstr ","
++#: ../extensions/cpsection/updater/view.py:276
++#, python-format
++msgid "Download size: %s"
++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"
++#: ../extensions/cpsection/updater/view.py:364
++#, python-format
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "Error en els modificadors de color especificats"
++#. TRANS: download size is 0
++#: ../extensions/cpsection/updater/view.py:382
++#, fuzzy
++msgid "None"
++msgstr "Fet"
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "Error en els colors especificats"
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "apagar"
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
++#, python-format
++msgid "%.0f KB"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "arrancar"
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
++#, python-format
++msgid "%.1f MB"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "Status deconegut"
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
+ 
+-#  dubtes:
+-# 1- manca una coma al text original
+-# 2- He posat on/off
+-#: ../shell/controlpanel/control.py:332
+-#: ../src/controlpanel/control.py:336
++#: ../extensions/deviceicon/battery.py:147
+ #, fuzzy
+-msgid "Error in specified radio argument use on/off."
+-msgstr "Error en l'argument de ràdio especificat, useu on/off"
++msgid "Removed"
++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ó"
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-msgstr "Error en llegir la zona horària"
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "Error en copiar la zona horària (des de %s): %s"
++msgid "%(hour)d:%(min).2d remaining"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "Canviant permisos de zona horària: %s"
++msgid "IP address: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "Error: aquesta zona horària no existeix"
++#: ../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/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."
++#: ../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/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."
++#: ../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/controlpanel/control.py:473
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "Ho sento, no parlo '%s'."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
++msgstr "Canal"
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Connectat al Portal de la Xarxa de l'Escola"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "Cercant el Portal de la Xarxa de l'Escola ..."
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "Connectat a un Portal de Xarxa XO"
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "Cercant un Portal de Xarxa XO ..."
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "Connectat a una xarxa simple"
++#: ../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/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "Arrancant una xarxa simple"
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
++msgstr "Desconnectat"
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "Xarxa desconeguda"
++#: ../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"
+ 
+-#: ../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"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-#: ../src/view/home/HomeBox.py:222
+-msgid "Not available"
+-msgstr "No disponible"
++#: ../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 ""
++
++# Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
++#: ../extensions/deviceicon/network.py:612
++#, fuzzy
++msgid "Mesh Network"
++msgstr "Xarxa Mesh"
++
++# 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 ""
++
++#: ../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 "Grup"
++
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Inici"
++
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Activitat"
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr "Captura de pantalla"
++
++#: ../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 "Per aplicar els canvis, cal que reiniciar el 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 ""
++
++#: ../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"
++
++#: ../src/jarabe/controlpanel/toolbar.py:125
++#: ../src/jarabe/desktop/favoritesview.py:347
++msgid "Ok"
++msgstr "D'acord"
++
++#: ../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 "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"
++
++# 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 "Ad-hoc Network %d"
++msgstr ""
++
++# Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++#, 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 ""
++
++#: ../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 "Eliminar"
++
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
++msgstr "Obrir"
++
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
++msgstr ""
++
++#: ../src/jarabe/frame/clipboardobject.py:50
++#, python-format
++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 ""
++
++#: ../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 "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
++msgctxt "Volume"
++msgid "Remove"
++msgstr "Eliminar"
++
++#: ../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 "Afegir al diari"
++
++#, python-format
++#~ msgid "Clipboard object: %s."
++#~ msgstr "Objecte del porta-retalls: %s"
++
++#~ 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"
++
++#, python-format
++#~ 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"
++
++#, python-format
++#~ msgid "%d year"
++#~ msgstr "%d any"
++
++#, python-format
++#~ msgid "%d years"
++#~ msgstr "%d anys"
++
++#, python-format
++#~ msgid "%d month"
++#~ msgstr "%d mes"
++
++#, python-format
++#~ msgid "%d months"
++#~ msgstr "%d mesos"
++
++#, python-format
++#~ msgid "%d week"
++#~ msgstr "%d setmana"
++
++#, python-format
++#~ msgid "%d weeks"
++#~ msgstr "%d setmanes"
++
++#, python-format
++#~ msgid "%d day"
++#~ msgstr "%d dia"
++
++#, python-format
++#~ msgid "%d days"
++#~ msgstr "%d dies"
++
++#, python-format
++#~ msgid "%d hour"
++#~ msgstr "%d hora"
++
++#, python-format
++#~ msgid "%d hours"
++#~ msgstr "%d hores"
++
++#, 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/viewsource.py:205
+-#: ../src/jarabe/frame/zoomtoolbar.py:42
++#: ../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/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
+-msgid "Publish to Gadget"
++#: ../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:17
+-msgid "Setting for muting the sound device."
++#: ../data/sugar.schemas.in.h:49
++msgid "Show Sugar Ad-hoc networks"
+ msgstr ""
+ 
+-#: ../data/sugar.schemas.in.h:18
++#: ../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"
+-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"
++#: ../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: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/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: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/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/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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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:"
+-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 "اشتباه در تعدیل کننده رنگ معین"
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "دعوت به ( ) %s"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr "اشتباه د رنگ معین"
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "پاک کردن"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "برای تبدیلی رنگ تیک کن:"
+ 
+-#: ../shell/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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "به یادداشت اضافه کردن"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "شی در حافظه : %s"
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "نوعیت کلید:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "نوعیت تصدیق:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "نوعیت پنهانی کردن:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "در حال شروع شدن...."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "از سر گرفتن"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "توقف"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "عکس صفحه"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "دوباره چالان کردن"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/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
+-#: ../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 "شبکه بافته شده"
++#: ../extensions/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-msgstr "پیوستن"
++#: ../extensions/cpsection/datetime/model.py:92
++msgid "Error timezone does not exist."
++msgstr "اشتباه منطقه جغرافیایی ساعات وجود ندارد"
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "باطری پر میشود"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "باطری کاملا پر ش"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
+-msgstr "منقطع شد"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "کانال"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format, fuzzy
++msgid "%s seconds"
++msgstr "%d ثانیه ها"
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "همسایگی"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-msgstr "گروه"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "خانه"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr ""
+ 
+-#: ../shell/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 ""
++
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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 "شد"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. 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 ""
++
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "اشتباه در تعدیل کننده رنگ معین"
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "اشتباه د رنگ معین"
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
++msgstr "کانال"
++
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "خاموش کردن"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "روشن کردن"
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "حالان نامشخص هست"
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
+-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/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
+-msgstr "تردید اجازه. شما برای راندن این روش باید ریشه کار باشید"
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
++msgstr "منقطع شد"
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-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/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "اشتباه در نقل برداری منطقه جغرافیایی ساعات (از %s): %s"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "تبدیلی اجازت منطقه جغرافیایی ساعات: %s"
+-
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "اشتباه منطقه جغرافیایی ساعات وجود ندارد"
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "دسترسی نمیتواند %s. زمینه معیاری بسازید"
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "زبان برای رمز=%s تعین نمی گردد"
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "ببخشید من سخن گفته نمیتوانم \"%s\""
++msgid "%d KB"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "در حال تلاش برای یک مدخل تنیده مکتب"
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "با مدخل تنیده XO وصل گردید"
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "شبکه بافته شده"
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "در حال تلاش برای یک مدخل تنیده XO"
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "شبکه بافته شده"
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "با یک بافته ساده وصل گردید"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "در حال شروع یک بافته ساده"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "بافته نا مشخص"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "برای اجرا نمودن تغیرات تان شما باید شوگر را دوباره چالان کنید\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 ""
++
++#: ../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, 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 "%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 "با مدخل تنیده مکتب وصل گردید"
++
++#~ 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:"
+-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 "خطا در تعدیل کننده رنگ معین."
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "دعوت به %s"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr "خطا در رنگ معین."
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "حذف کن"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "برای تبدیلی رنگ تیک کن:"
+ 
+-#: ../shell/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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "به یادداشت اضافه کن"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr "در دسترس نیست"
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "شیی تخته رسم : %s."
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "نوعیت کلید:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "نوعیت تصدیق:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "نوعیت پنهانی کردن:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "در حال شروع شدن..."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "ادامه"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "توقف"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "عکس صفحه"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "راه اندازي مجدد"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/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
+-#: ../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 "شبکه تنیده"
++#: ../extensions/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-msgstr "پیوستن"
++#: ../extensions/cpsection/datetime/model.py:92
++msgid "Error timezone does not exist."
++msgstr "خطای منطقه زمانی وجود ندارد."
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "باطری در حال پرشدن"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "باطری کاملا پر شد"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
+-msgstr "منقطع شد"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "کانال"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format, fuzzy
++msgid "%s seconds"
++msgstr "%d ثانیه ها"
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "همسایگی"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-msgstr "گروه"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "خانه"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr ""
+ 
+-#: ../shell/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 "OK"
++#: ../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 ""
++
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
++msgstr ""
++
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
++msgstr ""
++
++#: ../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 "حذف کن"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "%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 ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "خطا در تعدیل کننده رنگ معین."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "خطا در رنگ معین."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
++msgstr "کانال"
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "خاموش"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "روشن"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "وضعیت نامشخص است."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
+-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 "منقطع شد"
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
+-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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-msgstr "خطا در خوانش منطقه زمانی"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "خطا در خوانش منطقه زمانی (از %s): %s"
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "در حال تغییر دادن اجازت منطقه زمانی: %s"
+-
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "خطای منطقه زمانی وجود ندارد."
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "به %s دسترسی نمی تواند. زمینه معیاریی بسازید."
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "متأسفم من '%s' گفته نمیتوانم."
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-msgstr "با مدخل تنیده مکتب وصل گردید"
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "در حال تلاش برای یک مدخل تنیده مکتب..."
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "با مدخل تنیده XO وصل گردید"
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "شبکه تنیده"
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "در حال تلاش برای یک مدخل تنیده XO..."
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "شبکه تنیده"
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "با یک شبکه تنیده ساده وصل گردید"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "در حال شروع کردن یک شبکه تنیده ساده"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "شبکه تنیده نامشخص"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
+-msgstr "در مورد این XO"
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
+-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 "برای اجرا نمودن تغیرات تان شما باید شکر را دوباره آغاز کنید.\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 ""
++
++#: ../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, 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 "%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 "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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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/viewsource.py:205
+-#: ../src/jarabe/frame/zoomtoolbar.py:42
++#: ../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/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
+-msgid "Publish to Gadget"
++#: ../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:17
+-msgid "Setting for muting the sound device."
++#: ../data/sugar.schemas.in.h:49
++msgid "Show Sugar Ad-hoc networks"
+ msgstr ""
+ 
+-#: ../data/sugar.schemas.in.h:18
++#: ../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"
+-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"
++#: ../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: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/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: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/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/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,350 +16,1698 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:96
+-msgid "Click to change color:"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:146
+-msgid "Back"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:160
+-msgid "Done"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:163
+-msgid "Next"
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:59
+-msgid "Remove friend"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:62
+-msgid "Make friend"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:58
+-msgid "Remove"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:63
+-msgid "Open"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
+ 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"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:213
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../src/jarabe/desktop/homebox.py:76
++msgid "Check now"
++msgstr ""
++
++#: ../src/jarabe/desktop/homebox.py:197
++msgid "List view"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:149
++#: ../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/hardware/keydialog.py:169
++#: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:250
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/activitiesdonut.py:90
+-msgid "Starting..."
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/activitiesdonut.py:104 ../src/view/home/MeshBox.py:295
++#. 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/view/home/activitiesdonut.py:111
+-msgid "Stop"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:285
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:159
+-msgid "Reboot"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:164
+-msgid "Shutdown"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:170
+-msgid "Register"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:175 ../src/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ 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..."
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:300
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:38
+-msgid "My Battery life"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:94
+-msgid "Battery charging"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:96
+-msgid "Battery discharging"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:98
+-msgid "Battery fully charged"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:61
+-msgid "Disconnected"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../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/view/frame/zoomtoolbar.py:42
++#: ../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/view/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../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/activity/activity.py:245
+-msgid "Undo"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../src/jarabe/journal/expandedentry.py:264
++#, python-format
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "%s Activity"
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:219
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:273
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:276
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:312
+-msgid "off"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:314
+-msgid "on"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:316
+-msgid "State is unknown."
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:336
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:340
+-msgid "Permission denied. You need to be root to run this method."
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:370
+-msgid "Error in reading timezone"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:401
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:406
++#: ../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 ""
+ 
+-#: ../src/controlpanel/control.py:416
+-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 ""
+ 
+-#: ../src/controlpanel/control.py:421 ../src/controlpanel/control.py:440
++#: ../src/jarabe/journal/misc.py:273
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/control.py:467
++#: ../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 ""
++
++#: ../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/controlpanel/control.py:477
++#: ../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 ""
+ 
+-#: ../src/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 ""
+ 
+-#: ../src/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 ""
+ 
+-#: ../src/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 ""
+ 
+-#: ../src/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 ""
+ 
+-#: ../src/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 ""
+ 
+-#: ../src/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 ""
++
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:27
++#: ../src/jarabe/model/network.py:180
+ 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"
+-"    "
++"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/controlpanel/cmd.py:55 ../src/controlpanel/cmd.py:67
+-#: ../src/controlpanel/cmd.py:74
++#: ../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 "sugar-control-panel: key=%s not an available option"
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:80
++#: ../src/jarabe/view/launcher.py:145
+ #, python-format
+-msgid "sugar-control-panel: %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 ""
++
++#: ../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 ""
++
++#: ../extensions/cpsection/aboutme/model.py:80
++#, python-format
++msgid "fill:     color=%s hue=%s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:23
+-msgid "Forward"
+-msgstr "Tura"
++#: ../extensions/cpsection/aboutme/model.py:82
++#, python-format
++msgid "fill:     %s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:29
+-msgid "Reload"
+-msgstr "Sake Lodi"
++#: ../extensions/cpsection/aboutme/model.py:94
++msgid "Error in specified color modifiers."
++msgstr ""
+ 
+-#: ../shell/shell.py:333
+-msgid "Everyone"
+-msgstr "Kowa"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr ""
+ 
+-#: ../sugar/chat/ChatEditor.py:43
+-msgid "Send"
+-msgstr "Aika"
++#: ../extensions/cpsection/aboutme/view.py:235
++msgid "Click to change your color:"
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:67
+-msgid "Name:"
++#: ../extensions/cpsection/aboutcomputer/__init__.py:21
++msgid "About my Computer"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:96
+-msgid "Click to change color:"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:160
+-msgid "Done"
++#: ../extensions/cpsection/aboutcomputer/model.py:171
++#, python-format
++msgid "%(interface)s: %(version)s"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:163
+-msgid "Next"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:59
+-msgid "Remove friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:62
+-msgid "Make friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:63
+-msgid "Open"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
+ 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:147
++msgid "Wireless Firmware:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../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 ""
+ 
+-#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++msgid "%.1f MB"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:147
++msgid "Removed"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "%d second"
++msgid "%(hour)d:%(min).2d remaining"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+-msgid "%d seconds"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../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 "Language for code=%s could not be determined."
++msgid "Mesh Network %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../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 "Sorry I do not speak '%s'."
++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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:9
++msgid "Default nick"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "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 "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 "Yi Bincike"
++
++#: ../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 ""
++
++#~ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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,532 +15,1768 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Pootle 1.1.0rc2\n"
+ 
+-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
++#: ../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 "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è"
++
++#: ../extensions/cpsection/aboutcomputer/__init__.py:21
++msgid "About my Computer"
++msgstr ""
++
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr "Pa disponib"
++
++#: ../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 "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 "%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
++#, 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 "Language for code=%s could not be determined."
++msgstr "Lang pou kod=%s pa ka tèmine."
++
++#: ../extensions/cpsection/language/model.py:152
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr "Mwen regrèt mwen pa pale '%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 "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 "Error in specified argument use 0/1."
++msgstr "Erè nan itilizasyon limen/etenn agiman radio endike-a. "
++
++#: ../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 "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
++#: ../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..."
++
++#: ../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 "Chanèl"
++
++#: ../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 "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 "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 "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 ""
++
++#: ../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 "Gwoup"
++
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Lakay"
++
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Aktivite"
++
++#: ../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/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/jarabe/controlpanel/cmd.py:31
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr "Sugar-kontwòl-panèl: %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"
++"    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 ""
++"Sèvi: Sugar-Kontwòl-panèl [opsyon] kle [args ... ]\n"
++"\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/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 "Fini"
++
++#: ../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 "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 "Ad-hoc Network %d"
++msgstr ""
++
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format, fuzzy
++msgid "Mesh Network %d"
++msgstr "Rezo "
++
++#: ../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 "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/intro/intro.py:94
++#: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+ msgstr "Klike pou chanje koulè"
+ 
+-#: ../src/intro/intro.py:145
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+ msgid "Back"
+ msgstr "Retounen"
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "Fini"
+-
+-#: ../src/intro/intro.py:162
++#: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+ msgstr "Prochen"
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-msgstr "Retire zanmi"
++#: ../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/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "Fè zanmi"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Invite to %s"
+-msgstr "Envite sou %s"
++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/view/clipboardmenu.py:48
+-msgid "Remove"
+-msgstr "Retire"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
+-msgstr "Louvri"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
++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"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
+-msgstr "Objè ekritwa: %s."
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "Tip kle:"
++#: ../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/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "Tip otantifikasyon:"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "Tip kod sekrè"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
+-msgstr "Ekran projektwa"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-#, fuzzy
+-msgid "Disconnect"
+-msgstr "Dekonekte"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
++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
+-#, fuzzy
+-msgid "Disconnecting..."
+-msgstr "Dekonekte..."
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
++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
+-#, fuzzy
+-msgid "Connecting..."
+-msgstr "Dekonekte..."
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../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/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 "
++#: ../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 ""
+ 
+-# 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..."
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
+-msgstr "Repwann"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
+-msgstr "Rankontre"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:120
+-#, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
+-msgstr "Dekonekte"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
+-msgstr "Chanèl"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "Vwazinaj"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "Gwoup"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "Lakay"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "Aktivite"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
+-#, 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/jarabe/journal/palettes.py:75
++msgid "Start with"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr "Sugar-kontwòl-panèl: %s"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ 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
+-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"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/controlpanel/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "stroke:   color=%s hue=%s"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     %s"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
+-msgstr "Erè nan modifikatè endike koulè yo"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:88
+-msgid "Error in specified colors."
+-msgstr "Erè nan koulè endike yo"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "Pa disponib"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
+-msgstr "Erè lè lokal pa egziste."
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ 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/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "Lang pou kod=%s pa ka tèmine."
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "Mwen regrèt mwen pa pale '%s'."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
+-msgstr "Yo pa konnen eta l'"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++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/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-#, fuzzy
+-msgid "Click to change your color:"
+-msgstr "Klike pou chanje koulè"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Konekte sou rezo lekòl la"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "Ap chache rezo lekòl la"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "Konekte sou yon rezo XO"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "Ap chache yon rezo XO..."
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
+-msgstr "Konekte sou yon senp rezo"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "Retire zanmi"
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
+-msgstr "Kòmanse yon senp rezo"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "Fè zanmi"
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
+-msgstr "Rezo non idantifye"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "Fèmen"
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:367
+-msgid "Shutdown"
+-msgstr "Fèmen"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
++msgstr "Envite sou %s"
+ 
+-#: ../src/view/home/favoritesview.py:373
+-msgid "Register"
+-msgstr "Enskri"
++#: ../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 "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/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:193
++#: ../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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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/viewsource.py:205
+-#: ../src/jarabe/frame/zoomtoolbar.py:42
++#: ../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/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
+-msgid "Publish to Gadget"
++#: ../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:17
+-msgid "Setting for muting the sound device."
++#: ../data/sugar.schemas.in.h:49
++msgid "Show Sugar Ad-hoc networks"
+ msgstr ""
+ 
+-#: ../data/sugar.schemas.in.h:18
++#: ../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"
+-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"
++#: ../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: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/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: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/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/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 ""
++
++#: ../extensions/cpsection/aboutme/model.py:80
++#, python-format
++msgid "fill:     color=%s hue=%s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:23
+-msgid "Forward"
+-msgstr "Íhú"
++#: ../extensions/cpsection/aboutme/model.py:82
++#, python-format
++msgid "fill:     %s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:29
+-msgid "Reload"
+-msgstr "Bubatagharịa"
++#: ../extensions/cpsection/aboutme/model.py:94
++msgid "Error in specified color modifiers."
++msgstr ""
+ 
+-#: ../shell/shell.py:333
+-msgid "Everyone"
+-msgstr "Onyeọbụla"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr ""
+ 
+-#: ../sugar/chat/ChatEditor.py:43
+-msgid "Send"
+-msgstr "Ziga"
++#: ../extensions/cpsection/aboutme/view.py:235
++msgid "Click to change your color:"
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:67
+-msgid "Name:"
++#: ../extensions/cpsection/aboutcomputer/__init__.py:21
++msgid "About my Computer"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:96
+-msgid "Click to change color:"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:160
+-msgid "Done"
++#: ../extensions/cpsection/aboutcomputer/model.py:171
++#, python-format
++msgid "%(interface)s: %(version)s"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:163
+-msgid "Next"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:59
+-msgid "Remove friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:62
+-msgid "Make friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:63
+-msgid "Open"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
+ 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:147
++msgid "Wireless Firmware:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../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 ""
+ 
+-#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++msgid "%.1f MB"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:147
++msgid "Removed"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "%d second"
++msgid "%(hour)d:%(min).2d remaining"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+-msgid "%d seconds"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../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 "Language for code=%s could not be determined."
++msgid "Mesh Network %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../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 "Sorry I do not speak '%s'."
++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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:9
++msgid "Default nick"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "À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 "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 "Chọ̀ọ́"
++
++#: ../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 ""
++
++#~ 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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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,532 +16,1768 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Pootle 1.1.0rc2\n"
+ 
+-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
++#: ../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
++#, 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 "មិន​អាច​រក​បាន"
++
++#: ../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
++#, fuzzy
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr "មិន​អាច​អាន %s បាន​ទេ ។ បង្កើតស្ដង់ដារ​​សំរាប់​ការ​រៀបចំ"
++
++#: ../extensions/cpsection/language/model.py:129
++#, python-format
++msgid "Language for code=%s could not be determined."
++msgstr "កូដ​សំរាប់​ភាលា​ code=%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 ""
++
++#: ../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 "រួច​ហើយ"
++
++#. 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
++#: ../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 "ផ្ដាច់បណ្ដាញ"
++
++#: ../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 ""
++
++#: ../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 "sugar-control-panel: key=%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"
++"    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"
++"\t"
++
++#: ../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, 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 "%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/intro/intro.py:94
++#: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+ msgstr "ដូរ​ព័ណ"
+ 
+-#: ../src/intro/intro.py:145
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+ msgid "Back"
+ msgstr "ថយ​ក្រោយ"
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "រួច​ហើយ"
+-
+-#: ../src/intro/intro.py:162
++#: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+ msgstr "ថតទៅ​មុខ"
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-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/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "កសាង​មិត្ត​ភាព"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Invite to %s"
+-msgstr "អញ្ជើញទៅ %s"
++msgid "Kind: %s"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
+-msgstr "យក​ចេញ"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
+-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 ""
+ 
+-#. 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"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
+-msgstr "ក្ដារ​ខ្ទាស់​វត្ថុ: %s."
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "ប្រភេទ​ឆ្នុច: "
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-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/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "ប្រភេទ​អ៊ិនគ្រីប: "
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
+-msgstr "រូបថត​អេក្រង់​"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-#, fuzzy
+-msgid "Disconnect"
+-msgstr "ផ្ដាច់"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
++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
+-#, fuzzy
+-msgid "Disconnecting..."
+-msgstr "ផ្ដាច់បណ្ដាញ"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
++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
+-#, fuzzy
+-msgid "Connecting..."
+-msgstr "ផ្ដាច់បណ្ដាញ"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ 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 "បណ្ដាញត"
++#: ../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 ""
+ 
+-# 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 "ផ្ដាច់បណ្ដាញ"
++#: ../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/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
+-msgstr "បន្ត"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
+-msgstr "ចូល​រួម"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:120
+-#, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
+-msgstr "ផ្ដាច់"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
+-msgstr "ប៉ុស្ដិ៍"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "ភូមិ"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "ក្រុម"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "ផ្ទះ"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "សកម្មភាព"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
+-#, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr "sugar-control-panel: key=%s ជម្រើស​អត់​មាន​ទេ"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr "sugar-control-panel: %s"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ 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"
+-"	"
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/controlpanel/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "stroke:   color=%s hue=%s"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     %s"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
+-msgstr "កំណែ​សំរាប់​ពណ៌​នេះ​មាន​បញ្ហា"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:88
+-msgid "Error in specified colors."
+-msgstr "ពណ៌​នេះ​មាន​បញ្ហា"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "មិន​អាច​រក​បាន"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
+-msgstr "មានបញ្ហា ។ ដំបន់​ម៉ោង​នេះ​អត់​មាន​ទេ"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-#, fuzzy
+-msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "មិន​អាច​អាន %s បាន​ទេ ។ បង្កើតស្ដង់ដារ​​សំរាប់​ការ​រៀបចំ"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "កូដ​សំរាប់​ភាលា​ code=%s មិន​អាន​រក​ឃើញ​ទេ"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "សូម​ទោស ខ្ញុំ​មិន​ចេះ​និយាយ​ភាសា '%s' ទេ"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
+-msgstr "ស្ថានភាព​មិន​ស្គាល់"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
+-msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-#, fuzzy
+-msgid "Click to change your color:"
+-msgstr "ដូរ​ព័ណ"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
+-msgstr "ផ្ជាប់នឹង​បណ្តាញ​ត​របស់​សាលា"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​សាលា"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "ផ្ជាប់​នឹង​បណ្ដាញត​ XO"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "ស្វែង​រក​បណ្តាញ​ត​របស់​ XO"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
+-msgstr "ផ្ជាប់​នឹង​បណ្ដាញ​ស៊ីមផល"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "ដក​មិត្ត​ចេញ"
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
+-msgstr "ចាប់​ផ្ដើម​បណ្ដាញ​ស៊ីមផល"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "កសាង​មិត្ត​ភាព"
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
+-msgstr "បណ្ដាញ​គ្មាន​សំគាល់"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "បិទ"
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:367
+-msgid "Shutdown"
+-msgstr "បិទ"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
++msgstr "អញ្ជើញទៅ %s"
+ 
+-#: ../src/view/home/favoritesview.py:373
+-msgid "Register"
+-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
++#: ../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/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:193
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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:"
+-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 ""
+ 
+-#. FIXME check that the buddy is not in the activity already
+-#: ../shell/view/BuddyMenu.py:96
+-msgid "Invite"
+-msgstr "Покани"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "Отстрани"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "Кликни да смениш боја:"
+ 
+-#: ../shell/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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "Додај во дневникот"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "Објект од таблата со исечоци: %s"
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "Соседство"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-msgstr "Група"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "Дома"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
+-msgstr "Активност"
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../services/clipboard/objecttypeservice.py:32
+-msgid "Text"
+-msgstr "Текст"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../services/clipboard/objecttypeservice.py:36
+-msgid "Image"
+-msgstr "Слика"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "Слика од екранот"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:164
+-msgid "Shutdown"
+-msgstr "Исклучи"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++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/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 ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "Батеријата се полни"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "Батеријата е наполнета"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
+-msgstr "Приватно"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
+-msgstr "Мое соседство"
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format
++msgid "%s seconds"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
+-msgstr "Зачувај"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
++#: ../extensions/cpsection/language/model.py:129
+ #, python-format
+-msgid "%s Activity"
+-msgstr "%s активност"
++msgid "Language for code=%s could not be determined."
++msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:84
++#: ../extensions/cpsection/language/model.py:152
+ #, python-format
+-msgid "Invite to %s"
++msgid "Sorry I do not speak '%s'."
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key 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:169
+-msgid "Authentication Type:"
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:170
+-msgid "Register"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
+ 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:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
++#: ../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/network/wireless.py:61
+-msgid "Disconnected"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d year"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d years"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d month"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d week"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d weeks"
++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"
++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"
++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"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hours"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-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 ""
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %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 ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:340
++#, python-format
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../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 "Соседство"
++
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../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'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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, 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 "%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 ""
++
++#: ../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 "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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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/viewsource.py:205
+-#: ../src/jarabe/frame/zoomtoolbar.py:42
++#: ../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/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
+-msgid "Publish to Gadget"
++#: ../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:17
+-msgid "Setting for muting the sound device."
++#: ../data/sugar.schemas.in.h:49
++msgid "Show Sugar Ad-hoc networks"
+ msgstr ""
+ 
+-#: ../data/sugar.schemas.in.h:18
++#: ../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"
+-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"
++#: ../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: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/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: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/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/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,502 +16,1698 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
+-#, python-format
+-msgid "Invite to %s"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ 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"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../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/hardware/keydialog.py:150
++#: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
++#: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#. 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/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
+-#: ../src/view/devices/network/mesh.py:86
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../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/view/devices/battery.py:120
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
++#: ../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/cmd.py:26
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "sugar-control-panel: %s"
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../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/controlpanel/model/aboutme.py:74
++#: ../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 "fill:     %s"
++msgid "Error while copying the entry. %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../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/model/aboutme.py:88
+-msgid "Error in specified colors."
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../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/controlpanel/model/language.py:104
++#: ../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 "Language for code=%s could not be determined."
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
++#: ../src/jarabe/journal/misc.py:274
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../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/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
++
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "%s seconds"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../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/view/home/favoritesview.py:367
++#: ../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,606 +16,1786 @@ 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"
++
++#: ../extensions/cpsection/aboutme/model.py:48
++msgid "You must enter a name."
++msgstr "Du må skrive inn et navn."
++
++#: ../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
++#, 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:"
++
++#: ../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 "%(interface)s: %(version)s"
++msgstr ""
++
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr "Identitet"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr "Serienummer:"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr "Programvare"
++
++#: ../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"
++
++#: ../extensions/cpsection/frame/view.py:28
++#, fuzzy
++msgid "instantaneous"
++msgstr "umiddelbar"
++
++#: ../extensions/cpsection/frame/view.py:29
++#, python-format
++msgid "%s seconds"
++msgstr "%s sekunder"
++
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr "Aktiveringsforsinkelse"
++
++#: ../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 ""
++
++#: ../extensions/cpsection/language/__init__.py:21
++#: ../extensions/cpsection/language/view.py:33
++msgid "Language"
++msgstr "Språk"
++
++#: ../extensions/cpsection/language/model.py:30
++#, fuzzy
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr "Fikk ikke tilgang til ~/.i18n. Lag standardinnstillinger."
++
++#: ../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."
++
++#: ../extensions/cpsection/language/model.py:152
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr "Beklager, jeg snakker ikke '%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 "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 "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 "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 "Error in extreme pm argument, use on/off."
++msgstr "Feil i argument til ekstrem strømstyring, bruk on/off."
++
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
++msgstr "Strømstyring"
++
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
++msgstr "Automatisk strømstyring (øker batterilevetiden)"
++
++#: ../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)"
++
++#: ../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 "Ferdig"
++
++#. 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 "Mitt Batteri"
++
++#: ../extensions/deviceicon/battery.py:147
++#, fuzzy
++msgid "Removed"
++msgstr "Fjern"
++
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr "Lader"
++
++#: ../extensions/deviceicon/battery.py:153
++#, fuzzy
++msgid "Very little power remaining"
++msgstr "Veldig lite strøm igjen"
++
++#: ../extensions/deviceicon/battery.py:158
++#, python-format
++#, fuzzy, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr "%(hour)d:%(min).2d gjenstår"
++
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr "Oppladet"
++
++#: ../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"
++
++#: ../extensions/deviceicon/speaker.py:138
++#, fuzzy
++msgid "Unmute"
++msgstr "Ikke demp"
++
++#: ../extensions/deviceicon/speaker.py:141
++msgid "Mute"
++msgstr "Demp"
++
++#: ../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 ""
++
++# 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"
++
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Hjem"
++
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Lek"
++
++#: ../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: "
++"%s module: %r"
++msgstr ""
++"sugar-control-panel: ADVARSEL, fant mer enn en opsjon med samme navnet: %s "
++"modul: %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 er ikke en tilgjengelig opsjon."
++
++#: ../src/jarabe/controlpanel/cmd.py:31
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr ""
++
++# Remember to fix indenting.
++#. 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"
++"    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 ""
++"Bruk: sugar-control-panel [ opsjon ] nøkkel [ argumenter ... ] \n"
++"    Kontrollerer sugar-miljøet. \n"
++"    Opsjoner: \n"
++"    -h           vis denne hjelpen og avsluttt \n"
++"    -l           lister alle tilgjengelig opsjoner \n"
++"    -h nøkkel       vis informasjon om denne nøkkelen \n"
++"    -g nøkkel       hent verdien til denne nøkkelen \n"
++"    -s nøkkel       sett denne nøkkelen sin verdi \n"
++"    "
++
++#: ../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/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/jarabe/controlpanel/gui.py:297
++#: ../src/jarabe/controlpanel/sectionview.py:41
++msgid "Changes require restart"
++msgstr "Endringer krever omstart"
++
++#: ../src/jarabe/controlpanel/gui.py:300
++msgid "Cancel changes"
++msgstr "Avbryt endringer"
++
++#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
++msgid "Later"
++msgstr "Senere"
++
++#: ../src/jarabe/controlpanel/gui.py:309
++msgid "Restart now"
++msgstr "Start om nå"
++
++#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
++msgid "Done"
++msgstr "Ferdig"
++
++#: ../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 "Bekreft sletting"
++
++#: ../src/jarabe/desktop/activitieslist.py:358
++#, python-format
++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 ""
++
++#. 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 "Registrer"
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
+-msgstr "Klikk her for å endre farge"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
++msgstr ""
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
+-msgstr "Tilbake"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
++msgstr ""
+ 
+-#: ../src/intro/intro.py:159
+-#: ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "Ferdig"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
++msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
+-msgstr "Neste"
++#: ../src/jarabe/desktop/homebox.py:76
++msgid "Check now"
++msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-msgstr "Fjern venn"
++#: ../src/jarabe/desktop/homebox.py:197
++msgid "List view"
++msgstr "Listevisning"
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "Bli venn"
++#: ../src/jarabe/desktop/homebox.py:198
++msgid "<Ctrl>2"
++msgstr ""
++
++#: ../src/jarabe/desktop/homebox.py:253
++#, fuzzy
++msgid "Favorites view"
++msgstr "Favoritvisning"
++
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
++msgstr ""
++
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
++msgstr "Nøkkelform:"
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
++msgstr "Autentiseringsform:"
++
++#: ../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 "Invite to %s"
+-msgstr "Inviter til %s"
++msgid "Ad-hoc Network %d"
++msgstr ""
++
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++#, fuzzy
++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/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
++msgstr "Avslå"
++
++#: ../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/view/clipboardmenu.py:48
++#: ../src/jarabe/frame/clipboardmenu.py:56
++#, fuzzy
++msgctxt "Clipboard"
+ msgid "Remove"
+ msgstr "Fjern"
+ 
+-#: ../src/view/clipboardmenu.py:53
+-#: ../src/view/clipboardmenu.py:79
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+ msgstr "Åpne"
+ 
+-#. 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"
+-
+-#: ../src/view/clipboardmenu.py:84
++#: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+ msgstr "Åpne med"
+ 
+-#: ../src/view/clipboardmenu.py:212
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-#, fuzzy, python-format
+-msgid "Clipboard object: %s."
+-msgstr "Utklipp: %s"
++msgid "%s clipping"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "Nøkkelform:"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
++msgstr "Nabolag"
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "Autentiseringsform:"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "Krypteringsform:"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:235
+-#, fuzzy
+-msgid "Screenshot"
+-msgstr "Skjermbilde"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-msgid "Confirm erase"
+-msgstr "Bekreft sletting"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
++msgstr ""
++
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
++msgstr "Navn:"
++
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
++msgstr "Klikk her for å endre farge"
++
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
++msgstr "Tilbake"
++
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
++msgstr "Neste"
++
++#: ../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/view/home/HomeBox.py:82
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr "Bekreft sletting: Ønsker du å slette %s for godt?"
++msgid "Kind: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:89
+-#: ../src/view/palettes.py:120
+-msgid "Erase"
+-msgstr "Slett"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:215
+-msgid "List view"
+-msgstr "Listevisning"
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:216
+-msgid "<Ctrl>2"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:273
+-#, fuzzy
+-msgid "Favorites view"
+-msgstr "Favoritvisning"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:274
+-msgid "<Ctrl>1"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:282
+-#, fuzzy
+-msgid "Freeform"
+-msgstr "Frihånd"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
++msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:289
+-msgid "Ring"
+-msgstr "Ring"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-msgstr "Koble til"
++#: ../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/view/home/MeshBox.py:106
+-msgid "Disconnect"
+-msgstr "Koble fra"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
+-msgstr "Kobler fra..."
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
+-msgstr "Kobler til..."
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
+-msgstr "Tilkoblet"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
++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
+-#, fuzzy
+-msgid "Mesh Network"
+-msgstr "Maskenettverk"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
++msgstr ""
+ 
+-#: ../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: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302
+-#: ../src/view/palettes.py:61
+-msgid "Resume"
+-msgstr "Gjenoppta"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307
+-#: ../src/view/frame/activitiestray.py:205
+-msgid "Join"
+-msgstr "Bli med"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
+-msgstr "Mitt Batteri"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
+-msgstr "Lader"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-#, fuzzy
+-msgid "Very little power remaining"
+-msgstr "Veldig lite strøm igjen"
++#: ../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/view/devices/battery.py:120
++#: ../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
+-#, fuzzy, python-format
+-msgid "%(hour)d:%(min).2d remaining"
+-msgstr "%(hour)d:%(min).2d gjenstår"
++msgid "Error while copying the entry. %s"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
+-msgstr "Oppladet"
++#: ../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/view/devices/speaker.py:41
+-msgid "My Speakers"
+-msgstr "Mine Høytalere"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr "Start"
+ 
+-#: ../src/view/devices/speaker.py:116
+-#, fuzzy
+-msgid "Unmute"
+-msgstr "Ikke demp"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:119
+-msgid "Mute"
+-msgstr "Demp"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
+-msgstr "Avkoblet"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
+-msgstr "Kanal"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "Nabolag"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "Gruppe"
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "Hjem"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "Lek"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
++msgstr ""
++
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
++#: ../src/jarabe/journal/misc.py:273
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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 ""
+-"sugar-control-panel: ADVARSEL, fant mer enn en opsjon med samme navnet: %s "
+-"modul: %r"
+ 
+-#: ../src/controlpanel/cmd.py:28
+-#, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr "sugar-control-panel: key=%s er ikke en tilgjengelig opsjon."
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-# Remember to fix indenting.
+-#: ../src/controlpanel/cmd.py:33
+-#, fuzzy
+-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"
+-"    "
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+-"Bruk: sugar-control-panel [ opsjon ] nøkkel [ argumenter ... ] \n"
+-"    Kontrollerer sugar-miljøet. \n"
+-"    Opsjoner: \n"
+-"    -h           vis denne hjelpen og avsluttt \n"
+-"    -l           lister alle tilgjengelig opsjoner \n"
+-"    -h nøkkel       vis informasjon om denne nøkkelen \n"
+-"    -g nøkkel       hent verdien til denne nøkkelen \n"
+-"    -s nøkkel       sett denne nøkkelen sin verdi \n"
+-"    "
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "For å gjennomføre endringene må du starte sugar på nytt.\n"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "Avbryt"
++#: ../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/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34
+-#: ../src/controlpanel/gui.py:260
+-msgid "Changes require restart"
+-msgstr "Endringer krever omstart"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:259
+-msgid "Warning"
+-msgstr "Advarsel"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:263
+-msgid "Cancel changes"
+-msgstr "Avbryt endringer"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:267
+-msgid "Later"
+-msgstr "Senere"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:271
+-msgid "Restart now"
+-msgstr "Start om nå"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
+-msgstr "Du må skrive inn et navn."
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     %s"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-#, fuzzy
+-msgid "Error in specified color modifiers."
+-msgstr "Feil i de angitte fargemodifikatorene."
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:88
+-msgid "Error in specified colors."
+-msgstr "Feil i de angitte fargene."
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "Ikke tilgjengelig"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
+-msgstr "Feil: Tidssonen finnes ikke."
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../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/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-#, fuzzy
+-msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "Fikk ikke tilgang til ~/.i18n. Lag standardinnstillinger."
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-#, fuzzy, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "Kunne ikke fastslå språket for koden=%s."
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "Beklager, jeg snakker ikke '%s'."
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
+-msgstr "Du må angi en tjener."
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
+-msgstr "Tilstanden er ukjent."
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ 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/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/power.py:86
+-#, fuzzy
+-msgid "Error in extreme pm argument, use on/off."
+-msgstr "Feil i argument til ekstrem strømstyring, bruk on/off."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
+-msgstr "Om meg"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
+-msgstr "Klikk for å endre din farge:"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
+-msgstr "Om min XO"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
+-msgstr "Identitet"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
+-msgstr "Serienummer:"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
+-msgstr "Programvare"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
+-msgstr "Bygg:"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-#, fuzzy
+-msgid "Firmware:"
+-msgstr "Fastvare:"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
+-msgstr "Dato og tid"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
+-msgstr "Tidssone"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
+-msgstr "Ramme"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
+-msgstr "aldri"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-#, fuzzy
+-msgid "instantaneous"
+-msgstr "umiddelbar"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
+-msgstr "%s sekunder"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
+-msgstr "Aktiveringsforsinkelse"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
+-msgstr "Hjørne"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
+-msgstr "Kant"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
+-msgstr "Språk"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "Fjern venn"
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
+-msgstr "Nettverk"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "Bli venn"
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
+-msgstr "Trådløs"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "Slå av"
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
+-msgstr "Radio:"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
++msgstr "Omstart"
+ 
+-# Maskenett
+-#: ../src/controlpanel/view/network.py:94
+-#, fuzzy
+-msgid "Mesh"
+-msgstr "Maskenett"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
+-msgstr "Tjener:"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:27
+-msgid "Power"
+-msgstr "Strøm"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
++msgstr "Inviter til %s"
+ 
+-#: ../src/controlpanel/view/power.py:51
+-msgid "Power management"
+-msgstr "Strømstyring"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:61
+-msgid "Automatic power management (increases battery life)"
+-msgstr "Automatisk strømstyring (øker batterilevetiden)"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
++msgstr "Starter..."
+ 
+-#: ../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)"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-#, fuzzy
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Koblet til en skolemaskenettportal"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-#, fuzzy
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "Leter etter en skolemaskenettportal"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
++msgstr "Stans"
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-#, fuzzy
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "Koblet til en XO maskenett portal"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
++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/view/palettes.py:180
++msgid "Show contents"
++msgstr "Vis innhold"
+ 
+-#: ../src/view/devices/network/mesh.py:118
++#: ../src/jarabe/view/palettes.py:229
+ #, fuzzy
+-msgid "Connected to a Simple Mesh"
+-msgstr "Koblet til et enkelt maskenett"
++msgctxt "Volume"
++msgid "Remove"
++msgstr "Fjern"
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-#, fuzzy
+-msgid "Starting a Simple Mesh"
+-msgstr "Starter et enkelt maskenett"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-#, fuzzy
+-msgid "Unknown Mesh"
+-msgstr "Ukjent maskenett"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
++msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:210
+-msgid "Decline"
+-msgstr "Avslå"
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:285
+-msgid "Registration Failed"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:286
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+ #, python-format
+-msgid "%s"
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:288
+-msgid "Registration Successful"
++#: ../src/jarabe/util/emulator.py:40
++msgid "Sugar in a window"
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:289
+-msgid "You are now registered with your school server."
+-msgstr ""
++#, python-format
++#, fuzzy, python-format
++#~ msgid "Clipboard object: %s."
++#~ msgstr "Utklipp: %s"
+ 
+-#: ../src/view/home/favoritesview.py:379
+-msgid "Control Panel"
+-msgstr "Kontrollpanel"
++#~ msgid "Encryption Type:"
++#~ msgstr "Krypteringsform:"
+ 
+-#: ../src/view/home/favoritesview.py:390
+-msgid "Restart"
+-msgstr "Omstart"
++#~ msgid "Disconnecting..."
++#~ msgstr "Kobler fra..."
+ 
+-#: ../src/view/home/favoritesview.py:395
+-msgid "Shutdown"
+-msgstr "Slå av"
++#~ msgid "Disconnect..."
++#~ msgstr "Koble fra..."
+ 
+-#: ../src/view/home/favoritesview.py:401
+-msgid "Register"
+-msgstr "Registrer"
++#~ msgid "You must enter a server."
++#~ msgstr "Du må angi en tjener."
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
+-msgstr "Starter..."
++#~ msgid "About my XO"
++#~ msgstr "Om min XO"
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
+-msgstr "Stans"
++#, fuzzy
++#~ msgid "Connected to a School Mesh Portal"
++#~ msgstr "Koblet til en skolemaskenettportal"
+ 
+-#: ../src/view/palettes.py:104
+-msgid "Start"
+-msgstr "Start"
++#, fuzzy
++#~ msgid "Looking for a School Mesh Portal..."
++#~ msgstr "Leter etter en skolemaskenettportal"
+ 
+-#: ../src/view/palettes.py:132
+-msgid "Remove favorite"
+-msgstr "Fjern favoritt"
++#, fuzzy
++#~ msgid "Connected to an XO Mesh Portal"
++#~ msgstr "Koblet til en XO maskenett portal"
+ 
+-#: ../src/view/palettes.py:136
+ #, fuzzy
+-msgid "Make favorite"
+-msgstr "Lagre som favoritt"
++#~ msgid "Looking for an XO Mesh Portal..."
++#~ msgstr "Leter etter en XO maskenett portal..."
+ 
+-#: ../src/view/palettes.py:185
+-msgid "Show contents"
+-msgstr "Vis innhold"
++#, fuzzy
++#~ msgid "Connected to a Simple Mesh"
++#~ msgstr "Koblet til et enkelt maskenett"
+ 
+-#: ../src/view/palettes.py:209
+-#, python-format
+-msgid "%(free_space)d MB Free"
+-msgstr "%(free_space)d MB ledig"
++#, 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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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,521 +15,1742 @@ 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:"
++#: ../extensions/cpsection/aboutme/__init__.py:24
++msgid "About Me"
++msgstr ""
++
++#: ../extensions/cpsection/aboutme/model.py:48
++#, fuzzy
++msgid "You must enter a name."
++msgstr "Bo mester fill in un nomber."
++
++#: ../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 "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 ""
++
++#: ../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 "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"
++
++#: ../extensions/deviceicon/battery.py:147
++#, fuzzy
++msgid "Removed"
++msgstr "Elimina"
++
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr "Kargando"
++
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr "A sobra masha tiki power "
++
++#: ../extensions/deviceicon/battery.py:158
++#, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr "A sobra %(ora)d:%(min).2d "
++
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr "Kargá"
++
++#: ../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"
++
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
++msgstr ""
++
++#: ../extensions/deviceicon/speaker.py:141
++msgid "Mute"
++msgstr "Silensia"
++
++#: ../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 "Grupo"
++
++#: ../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 "Aktividad"
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
+-msgstr "Klik pa kambia kolor:"
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:145
++#: ../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 ""
++"sugar-control-panel: KIDOU, a hanja mas ku un opshon ku e mesun nomber: %s "
++"modulo: %r"
++
++#: ../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/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 "Back"
+-msgstr "Bek"
++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 ""
++"Uso: sugar-control-panel [opshon] klave [argumentonan ...] \n"
++"       Control pa e ambiente di sugar.\n"
++"       Opshonnan: \n"
++"       -h             mustra e help mensahe aki i sali       -l "
++"             lista tur opshon disponibel\n"
++"       -h klave     mustra informashon riba e klave aki\n"
++"       -g klave     hanja e bolr koriente di e klave aki\n"
++"       -s klave     sèt e bolor koriente di klave aki\n"
++
++#: ../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/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/jarabe/controlpanel/gui.py:297
++#: ../src/jarabe/controlpanel/sectionview.py:41
++msgid "Changes require restart"
++msgstr "Kambionan ta eksigi restart"
++
++#: ../src/jarabe/controlpanel/gui.py:300
++msgid "Cancel changes"
++msgstr "Kansela kambionan"
++
++#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
++msgid "Later"
++msgstr "Despues"
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
++#: ../src/jarabe/controlpanel/gui.py:309
++msgid "Restart now"
++msgstr "Restart aworaki"
++
++#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+ msgid "Done"
+ msgstr "Kla"
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
+-msgstr "Sigiente"
++#: ../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 ""
++
++#: ../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/view/BuddyMenu.py:58
++#: ../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 "Remove friend"
+-msgstr "Kita amigu"
++msgid "List view"
++msgstr "Bista di lista"
+ 
+-#: ../src/view/BuddyMenu.py:61
++#: ../src/jarabe/desktop/homebox.py:198
+ #, fuzzy
+-msgid "Make friend"
+-msgstr "Hasi amigu"
++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 ""
++
++#. 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/view/BuddyMenu.py:91
++#: ../src/jarabe/desktop/networkviews.py:500
+ #, python-format
+-msgid "Invite to %s"
+-msgstr "Invita pa %s"
++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/view/clipboardmenu.py:48
++#: ../src/jarabe/frame/clipboardmenu.py:56
++#, fuzzy
++msgctxt "Clipboard"
+ msgid "Remove"
+ msgstr "Elimina"
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+ msgstr "Habri"
+ 
+-#. 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"
++#: ../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/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/view/clipboardmenu.py:84
+-msgid "Open with"
+-msgstr "Habri ku"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "Clipboard obgeto: %s."
+-
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "Tip di Tecla"
++msgid "Kind: %s"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "Tipo di Autentikashon"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "Tipo di Enkriptashon:"
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
+-msgstr "Kaptura di pantaya"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-#, fuzzy
+-msgid "List view"
+-msgstr "Bista di lista"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
+-msgstr "<CTRL>L"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
+-msgstr "<Ctrl>R"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../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 ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-msgstr "Konekta"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
+-msgstr "Diskonekta"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
+-msgstr "Deskonektando..."
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
+-msgstr "Konektando..."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
+-msgstr "Konektá"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
++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"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ 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..."
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
+-msgstr "Resumí"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
+-msgstr "Uni"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
+-msgstr "Mi Bateria"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
+-msgstr "Kargando"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
+-msgstr "A sobra masha tiki power "
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:120
++#: ../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 "%(hour)d:%(min).2d remaining"
+-msgstr "A sobra %(ora)d:%(min).2d "
++msgid "Error while copying the entry. %s"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
+-msgstr "Kargá"
++#: ../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/view/devices/speaker.py:40
+-#, fuzzy
+-msgid "My Speakers"
+-msgstr "Mi spikernan"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
+-msgstr "Silensia"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
+-msgstr "Deskonektá"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
+-msgstr "Kanal"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "Besindario"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "Grupo"
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "Home"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "Aktividad"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ 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/journal/misc.py:273
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr "sugar-control-panel: klave=%s no ta un opshon disponibel"
++msgid "Older Version Of %s Activity"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/misc.py:274
+ #, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr "sugar-control-panel: %s"
++msgid "Do you want to downgrade to version %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-#, fuzzy
+-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"
+-"    "
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+-"Uso: sugar-control-panel [opshon] klave [argumentonan ...] \n"
+-"       Control pa e ambiente di sugar.\n"
+-"       Opshonnan: \n"
+-"       -h             mustra e help mensahe aki i sali       -l "
+-"             lista tur opshon disponibel\n"
+-"       -h klave     mustra informashon riba e klave aki\n"
+-"       -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
+-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/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "Kansela"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
+-msgstr "Ok"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
++msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
+-msgstr "Kambionan ta eksigi restart"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:249
+-msgid "Warning"
+-msgstr "Kidou"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
+-msgstr "Kansela kambionan"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
+-msgstr "Despues"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
+-msgstr "Restart aworaki"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-#, fuzzy
+-msgid "You must enter a name."
+-msgstr "Bo mester fill in un nomber."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#: ../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/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     %s"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:88
+-msgid "Error in specified colors."
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../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/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-#, fuzzy
+-msgid "You must enter a server."
+-msgstr "Bo mester fill in un nomber."
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-#, fuzzy
+-msgid "Click to change your color:"
+-msgstr "Klik pa kambia kolor:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../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/view/home/favoritesview.py:367
++#: ../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/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/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
++#, 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,502 +16,1698 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
+-#, python-format
+-msgid "Invite to %s"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ 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"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../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/hardware/keydialog.py:150
++#: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
++#: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#. 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/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
+-#: ../src/view/devices/network/mesh.py:86
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../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/view/devices/battery.py:120
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
++#: ../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/cmd.py:26
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "sugar-control-panel: %s"
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../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/controlpanel/model/aboutme.py:74
++#: ../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 "fill:     %s"
++msgid "Error while copying the entry. %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../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/model/aboutme.py:88
+-msgid "Error in specified colors."
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../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/controlpanel/model/language.py:104
++#: ../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 "Language for code=%s could not be determined."
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
++#: ../src/jarabe/journal/misc.py:274
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../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/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
++
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "%s seconds"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../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/view/home/favoritesview.py:367
++#: ../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 "د بدلوونې رنګ په ټاكنه كۍ تېروتنه."
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "بلون %s ته"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr "په مالومو رنګونو كې تېروتنې بدلوونې"
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
+-msgstr "لركول"
++#: ../extensions/cpsection/aboutme/view.py:235
++#, fuzzy
++msgid "Click to change your color:"
++msgstr "د رنګ بدلون لپاره ټك كړئ:"
+ 
+-#: ../shell/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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "ورځپاڼې ته زياتول"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "د ټوټه دړې څيزونه: %s."
++msgid "%(interface)s: %(version)s"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "كلي ځېل:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "د كره توب ځېل:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
++msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "د کوډه کښنه ځېل:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "پيلونه..."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "کارمخینه"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "تمېدل"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-#, fuzzy
+-msgid "Screenshot"
+-msgstr "پرده انځور"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "بیاپیلون"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/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 ""
+ 
+-#: ../shell/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
+-#: ../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/datetime/__init__.py:21
++msgid "Date & Time"
++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/datetime/model.py:92
++msgid "Error timezone does not exist."
++msgstr "تېروتنه، مهالزون شتون نلري."
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-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 ""
+ 
+-#: ../shell/view/devices/battery.py:38
+-msgid "My Battery life"
+-msgstr "زما د بېټرۍ ژوند"
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
++msgid "Value must be an integer."
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "بېټرۍ چارجېږي"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:96
+-#, fuzzy
+-msgid "Battery discharging"
+-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 ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
++#: ../extensions/cpsection/language/model.py:30
+ #, fuzzy
+-msgid "Disconnected"
+-msgstr "ناپيوستل"
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr "%s ته لاسرسې نه كېږي. كره امستنې وپنځوئ"
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "چېنل"
++#: ../extensions/cpsection/language/model.py:129
++#, python-format
++msgid "Language for code=%s could not be determined."
++msgstr "د code=%s لپاره ژبه مالومه نكړاى شوه."
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "ګاونډېتوب"
++#: ../extensions/cpsection/language/model.py:152
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr "بښنه غواړم زه خبرې نه كوم '%s'."
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-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/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "کور"
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
+-msgstr "چارندتیا"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
+-msgstr "ونډول له:"
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
+-msgstr "ځاني"
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
+-msgstr "زما ګاونډيتوب"
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
+-msgstr "خوندي كول"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
+-msgstr "ناکړ"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
+-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/activity/activity.py:260
+-msgid "Copy"
+-msgstr "لمېسل"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
+-msgstr "سرېښل"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
++msgstr "ايالت ناڅرګند دى."
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
+-msgstr "%s چارندتیا"
++#: ../extensions/cpsection/network/model.py:99
++#, fuzzy
++msgid "Error in specified radio argument use on/off."
++msgstr "په ټاكلي راډيو كې تېروتنې "
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
+-msgstr "تېروتنې ساتل"
++#: ../extensions/cpsection/network/model.py:140
++#, fuzzy
++msgid "Error in specified argument use 0/1."
++msgstr "په ټاكلي راډيو كې تېروتنې "
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
+-msgstr "تېروتنې ساتل: ټول بدلونونه به له لاسه وركړئ"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
+-msgstr "مه تمېږه"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
+-msgstr "پ هره توګه تمېدل"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
+-msgstr "رنګول"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
+-msgstr "هو"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
+-msgstr "ادامه وركول"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
+-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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d year"
+-msgstr "%d كال"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d years"
+-msgstr "%d كلونه"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d month"
+-msgstr "%d مياشت"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
+-msgstr "%d مياشتې"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
+-#, python-format
+-msgid "%d week"
+-msgstr "%d اونۍ"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
+-msgstr "%d اونۍ"
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#: ../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 day"
+-msgstr "%d ورځ"
++msgid "Checking %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d days"
+-msgstr "%d ورځې"
++msgid "Downloading %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d hour"
+-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:179
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d hours"
+-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:180
++#: ../extensions/cpsection/updater/view.py:173
+ #, python-format
+-msgid "%d minute"
+-msgstr "%d دقيقه"
++msgid "%s update was installed"
++msgid_plural "%s updates were installed"
++msgstr[0] ""
++msgstr[1] ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/cpsection/updater/view.py:255
++msgid "Install selected"
++msgstr ""
++
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d minutes"
+-msgstr "%d دقيقې"
++msgid "Download size: %s"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d second"
+-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 "هوكې"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d seconds"
+-msgstr "%d ثانيې"
++msgid "%.0f KB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
+-msgstr "_او_"
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
++#, python-format
++msgid "%.1f MB"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
+-msgstr "،_"
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "د بدلونونو كارولو لپاره تاسې بايد شوګر بیاپیل كړئ.\n"
++#: ../extensions/deviceicon/battery.py:147
++#, fuzzy
++msgid "Removed"
++msgstr "لركول"
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "د بدلوونې رنګ په ټاكنه كۍ تېروتنه."
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "په مالومو رنګونو كې تېروتنې بدلوونې"
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "بندول"
++#: ../extensions/deviceicon/battery.py:158
++#, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "روښانول"
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "ايالت ناڅرګند دى."
++#: ../extensions/deviceicon/network.py:49
++#, python-format
++msgid "IP address: %s"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
++#: ../extensions/deviceicon/network.py:104
++#: ../extensions/deviceicon/network.py:303
++#: ../src/jarabe/desktop/networkviews.py:140
++#: ../src/jarabe/desktop/networkviews.py:508
+ #, fuzzy
+-msgid "Error in specified radio argument use on/off."
+-msgstr "په ټاكلي راډيو كې تېروتنې "
++msgid "Disconnect"
++msgstr "ناپيوستل"
+ 
+-#: ../shell/controlpanel/control.py:336
+-#, fuzzy
+-msgid "Permission denied. You need to be root to run this method."
+-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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-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 ""
+ 
+-#: ../shell/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "تېروتنه مهالزون لمېسل (له %s):  %s"
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
+-#, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "مهالزون پرېښلې د بدلون په حال كې: %s"
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
++msgstr "چېنل"
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "تېروتنه، مهالزون شتون نلري."
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+-#, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "%s ته لاسرسې نه كېږي. كره امستنې وپنځوئ"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:463
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "د code=%s لپاره ژبه مالومه نكړاى شوه."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "بښنه غواړم زه خبرې نه كوم '%s'."
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-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/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "د ښوونځي مېش ور لپاره لټون"
++#: ../extensions/deviceicon/network.py:287
++#, fuzzy
++msgid "Disconnected"
++msgstr "ناپيوستل"
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "د  XO مېش ور سره پيوست شو."
++#: ../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/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "د XO مېش ور لپاره لټون"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "له ساده مېش سره پيوست شو."
++#: ../extensions/deviceicon/network.py:336
++#, python-format
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "د ساده مېش پيلېدنه"
++#: ../extensions/deviceicon/network.py:340
++#, python-format
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "ناڅرګنده مېش"
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
++#, python-format
++msgid "%d KB"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "ډله"
++
++#: ../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
++#, fuzzy
++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 "د بدلونونو كارولو لپاره تاسې بايد شوګر بیاپیل كړئ.\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 ""
++
++#: ../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, 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 "%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 "بېټرۍ چارجېږي"
++
++#, 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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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
+-#, python-format
+-msgid "Invite to %s"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
++#: ../extensions/cpsection/aboutme/view.py:235
++msgid "Click to change your color:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:63
+-msgid "Open"
+-msgstr "Deschide"
++#: ../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)
+-#: ../shell/view/clipboardmenu.py:73
+-msgid "Add to journal"
+-msgstr "Adaugă la jurnal"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
++msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../extensions/cpsection/aboutcomputer/model.py:171
+ #, python-format
+-msgid "Clipboard object: %s."
++msgid "%(interface)s: %(version)s"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
+ msgstr ""
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
+ msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+-msgid "Resume"
+-msgstr "Reia"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
++msgstr ""
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "Oprește"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
++#: ../extensions/cpsection/aboutcomputer/view.py:147
++msgid "Wireless Firmware:"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "Reporneşte"
++#: ../extensions/cpsection/aboutcomputer/view.py:170
++msgid "Copyright and License"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:164
+-msgid "Shutdown"
++#: ../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 ""
+ 
+-#: ../shell/view/home/HomeBox.py:170
+-msgid "Register"
+-msgstr "Înregistrează"
++#: ../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
+-#: ../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/datetime/__init__.py:21
++msgid "Date & Time"
+ 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/datetime/model.py:92
++msgid "Error timezone does not exist."
+ msgstr ""
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
++#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
++msgid "Timezone"
+ msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:38
+-msgid "My Battery life"
+-msgstr "Durata bateriei mele"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "Bateria se încarcă"
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
++msgid "Value must be an integer."
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:96
+-msgid "Battery discharging"
+-msgstr "Bateria se descarcă"
++#: ../extensions/cpsection/frame/view.py:27
++msgid "never"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
++#: ../extensions/cpsection/frame/view.py:28
++msgid "instantaneous"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/keyboard/__init__.py:21
++#: ../extensions/cpsection/keyboard/view.py:32
++msgid "Keyboard"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "Acasă"
++#: ../extensions/cpsection/keyboard/view.py:190
++msgid "Keyboard Model"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
+-msgstr "Activitate"
++#: ../extensions/cpsection/keyboard/view.py:250
++msgid "Key(s) to change layout"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/keyboard/view.py:319
++msgid "Keyboard Layout(s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/language/__init__.py:21
++#: ../extensions/cpsection/language/view.py:33
++msgid "Language"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/language/model.py:30
++msgid "Could not access ~/.i18n. Create standard settings."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
+-msgstr "Păstrează"
++#: ../extensions/cpsection/language/model.py:129
++#, python-format
++msgid "Language for code=%s could not be determined."
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
+-msgstr "Anulează"
++#: ../extensions/cpsection/language/model.py:152
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
+-msgstr "Refă"
++#: ../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:260
+-msgid "Copy"
+-msgstr "Copiază"
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
+-msgstr "Lipeşte"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
+-msgstr "Anulează"
++#: ../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:168
+-msgid "Ok"
+-msgstr "Ok"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
+-msgstr "Continuă"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
+-msgstr "OK"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d year"
+-msgstr "%d an"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
+-#, python-format
+-msgid "%d years"
+-msgstr "%d ani"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d month"
+-msgstr "%d lună"
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d months"
+-msgstr "%d luni"
++msgid "Checking %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d week"
+-msgstr "%d săptămână"
++msgid "Downloading %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d weeks"
+-msgstr "%d săptămâni"
++msgid "Updating %s..."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
++msgstr ""
++
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d day"
+-msgstr "%d zi"
++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/objectchooser.py:178
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
++msgstr ""
++
++#: ../extensions/cpsection/updater/view.py:173
+ #, python-format
+-msgid "%d days"
+-msgstr "%d zile"
++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 oră"
++msgid "Download size: %s"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hours"
+-msgstr "%d ore"
++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"
+ 
+-#: ../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 minut"
++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 minute"
++msgid "%.1f MB"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:147
++msgid "Removed"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "%d second"
+-msgstr "%d secundă"
++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 secunde"
++msgid "IP address: %s"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
+-msgstr " şi "
++#: ../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 ""
+ 
+-#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 "Acasă"
++
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Activitate"
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "Gata"
++
++#: ../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 ""
++
++#: ../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 "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 ""
++
++#. 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 "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 "Deschide"
++
++#: ../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 "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 "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 "Ş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 "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 "Oprește"
++
++#: ../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 ""
++
++#~ 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,502 +16,1698 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
+-#, python-format
+-msgid "Invite to %s"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ 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"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../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/hardware/keydialog.py:150
++#: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
++#: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#. 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/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
+-#: ../src/view/devices/network/mesh.py:86
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../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/view/devices/battery.py:120
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
++#: ../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/cmd.py:26
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "sugar-control-panel: %s"
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../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/controlpanel/model/aboutme.py:74
++#: ../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 "fill:     %s"
++msgid "Error while copying the entry. %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../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/model/aboutme.py:88
+-msgid "Error in specified colors."
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../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/controlpanel/model/language.py:104
++#: ../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 "Language for code=%s could not be determined."
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
++#: ../src/jarabe/journal/misc.py:274
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../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/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
++
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "%s seconds"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../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/view/home/favoritesview.py:367
++#: ../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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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
+-msgid "Restart now"
+-msgstr "Ponovni zagon"
++#: ../src/jarabe/controlpanel/gui.py:309
++msgid "Restart now"
++msgstr "Ponovni zagon"
++
++#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
++msgid "Done"
++msgstr "Končano"
++
++#: ../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/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+-msgid "Done"
+-msgstr "Končano"
++#: ../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/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/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/controlpanel/toolbar.py:121
+-#: ../src/jarabe/desktop/favoritesview.py:338
+-msgid "Ok"
+-msgstr "V redu"
++#: ../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:90
++msgid "Name:"
++msgstr "Ime:"
+ 
+-#: ../src/jarabe/intro/window.py:124
++#: ../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/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr ""
+ 
+-#: ../src/jarabe/view/buddymenu.py:62
++#: ../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,600 +15,1779 @@ 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 "నాగురించి"
++
++#: ../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 "రంగు మార్చడానికి నొక్కు"
++
++#: ../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
++#, 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 "%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
++#, fuzzy
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr "%s ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
++
++#: ../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
++#, 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 "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 "పూర్తి అయినది"
++
++#. 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 "%(hour)d:%(min).2d మిగిలిఉంది"
++
++#: ../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
++#: ../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 "వేరుచేయి . . ."
++
++#: ../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 "నా  స్పీకరులు"
++
++#: ../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 ""
++"షుగర్-కంట్రోల్-పేనల్: గమనిక, అదేపేరుతో ఒకటికన్నా ఎక్కువ అవకాశాలు ఉన్నవి: %s "
++"module: %r"
++
++#: ../src/jarabe/controlpanel/cmd.py:30
++#, python-format
++msgid "sugar-control-panel: key=%s not an available option"
++msgstr "షుగర్-కంట్రోల్-పేనల్: key=%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
++#, fuzzy
++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 ""
++
++#: ../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 శాశ్వతంగా చెరిపివేయబడుట ఇష్టమేనా?"
++
++# 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 "%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
++#, 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/intro/intro.py:94
+-msgid "Click to change color:"
+-msgstr "రంగు మార్చడానికి నొక్కు"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
++msgstr "తాళం రకము:"
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
+-msgstr "వెనుకకు"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
++msgstr "దృడపరచుకొనే రకము:"
+ 
+-#: ../src/intro/intro.py:159
+-#: ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "పూర్తి అయినది"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
++msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
+-msgstr "తర్వాత"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
++msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-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/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "స్నేహం చేయి"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
++msgstr "కలువు"
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/desktop/networkviews.py:500
+ #, python-format
+-msgid "Invite to %s"
+-msgstr "%s కు పిలువు"
++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 "%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/view/clipboardmenu.py:48
++#: ../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/view/clipboardmenu.py:53
+-#: ../src/view/clipboardmenu.py:79
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+ 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 "ఉంచు"
+-
+-#: ../src/view/clipboardmenu.py:84
++#: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+ msgstr "తో తెరువు"
+ 
+-#: ../src/view/clipboardmenu.py:216
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "క్లిప్ బోర్డు వస్తువు : %s."
++msgid "%s clipping"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "తాళం రకము:"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
++msgstr "చుట్టుపక్కలవారు"
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "దృడపరచుకొనే రకము:"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
++msgstr ""
++
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
++msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "గుప్త్తీకరించే రకము:"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
++msgstr ""
+ 
+-#: ../src/view/Shell.py:240
+-msgid "Screenshot"
+-msgstr "తెరముద్ర"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-msgid "Confirm erase"
+-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/view/home/HomeBox.py:82
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr "చెరిపివేయుట నిర్ద్దారణ చేయుట:  %s శాశ్వతంగా చెరిపివేయబడుట ఇష్టమేనా?"
++msgid "Kind: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:89
+-#: ../src/view/palettes.py:120
+-msgid "Erase"
+-msgstr "చెరిపివేయి"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:215
+-msgid "List view"
+-msgstr "వరసగా చూడు"
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:216
+-#, fuzzy
+-msgid "<Ctrl>2"
+-msgstr "<Ctrl>L"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:273
+-msgid "Favorites view"
+-msgstr "ఇష్టమైనవి చూచుటకు"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:274
+-#, fuzzy
+-msgid "<Ctrl>1"
+-msgstr "<Ctrl>L"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
++msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:282
+-msgid "Freeform"
+-msgstr "కలగలుపుగా"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
++msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:289
+-msgid "Ring"
+-msgstr "వ్రుత్తము"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-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/view/home/MeshBox.py:106
+-#, fuzzy
+-msgid "Disconnect"
+-msgstr "వేరుచేయబడింది"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
++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
+-#, fuzzy
+-msgid "Disconnecting..."
+-msgstr "వేరుచేయి . . ."
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++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
+-#, fuzzy
+-msgid "Connecting..."
+-msgstr "వేరుచేయి . . ."
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
++msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
+-msgstr "తగిలించబడినది"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
++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 "మెష్ వల"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
++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 "వేరుచేయి . . ."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302
+-#: ../src/view/palettes.py:61
+-msgid "Resume"
+-msgstr "పునరారంభించు"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307
+-#: ../src/view/frame/activitiestray.py:205
+-msgid "Join"
+-msgstr "కలువు"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
+-msgstr "నా బేటరీ"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
+-msgstr "చార్జి అవుతుంది"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
+-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/view/devices/battery.py:123
++#: ../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 "%(hour)d:%(min).2d remaining"
+-msgstr "%(hour)d:%(min).2d మిగిలిఉంది"
++msgid "Error while copying the entry. %s"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
+-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/view/devices/speaker.py:44
+-msgid "My Speakers"
+-msgstr "నా  స్పీకరులు"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
++msgstr "మొదలుపెట్టు"
+ 
+-#: ../src/view/devices/speaker.py:119
+-msgid "Unmute"
+-msgstr "పలికించు"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:122
+-msgid "Mute"
+-msgstr "నిశ్శబ్దంగా ఉంచు"
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
+-msgstr "వేరుచేయబడింది"
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:137
+-msgid "Channel"
+-msgstr "ప్రసారమార్గం"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
+-msgstr "చుట్టుపక్కలవారు"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "గుంపు"
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "ఇల్లు"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-msgstr "వ్యాపకం"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
++msgstr ""
++
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:26
++#: ../src/jarabe/journal/misc.py:273
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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 ""
+-"షుగర్-కంట్రోల్-పేనల్: గమనిక, అదేపేరుతో ఒకటికన్నా ఎక్కువ అవకాశాలు ఉన్నవి: %s "
+-"module: %r"
+ 
+-#: ../src/controlpanel/cmd.py:28
+-#, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr "షుగర్-కంట్రోల్-పేనల్: key=%s అవకాశం లేదు"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
++
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr "షుగర్-కంట్రోల్-పేనల్:  %s"
++msgid "%(free_space)d MB Free"
++msgstr "%(free_space)d MB ఖాళీ"
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
+-msgstr "షుగర్-కంట్రోల్-పేనల్:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "మీ మార్పులు పనిచేయడానికి సుగరును తిరిగి మొదలు పెట్టండి.\n"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "రద్దు చేయి"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-#: ../src/view/home/favoritesview.py:294
+-msgid "Ok"
+-msgstr "సరి"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34
+-#: ../src/controlpanel/gui.py:260
+-msgid "Changes require restart"
+-msgstr "మార్పులు తిరిగి మొదలుపెట్తినతర్వాతే పనిచేస్తాయి"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:259
+-msgid "Warning"
+-msgstr "గమనిక"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:263
+-msgid "Cancel changes"
+-msgstr "మార్పులు రద్దుచేయి"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:267
+-msgid "Later"
+-msgstr "తరవాత"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:271
+-msgid "Restart now"
+-msgstr "ఇప్పుడు మరలామొదలుపెట్టు"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
+-msgstr "మీరు పేరు నింపవలెను"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
+-msgstr "కుంచె:   color=%s hue=%s"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "stroke:   %s"
+-msgstr "కుంచె:   %s"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
+-msgstr "నింపు:     color=%s hue=%s"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:76
+-#, python-format
+-msgid "fill:     %s"
+-msgstr "నింపు:     %s"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:87
+-msgid "Error in specified color modifiers."
+-msgstr "నిర్ధేశించి చెప్పిన రంగులు మార్చడంలో పొరబాటు జరిగింది"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:90
+-msgid "Error in specified colors."
+-msgstr "నిర్ధేశించి చెప్పిన రంగులలో పొరబాటు జరిగింది"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "అలభ్యం"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
+-msgstr "పొరబాటు. కాలమండలమే లేదు."
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38
+-#: ../src/controlpanel/model/frame.py:60
+-#, fuzzy
+-msgid "Value must be an integer."
+-msgstr "అంకెలు ఉపయోగించండి"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-#, fuzzy
+-msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "%s ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "కోడ్=%s కు భాష తెలియ లేదు."
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "మన్నించాలి నేను '%s'మాట్లాడలేను"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-#, fuzzy
+-msgid "You must enter a server."
+-msgstr "మీరు పేరు నింపవలెను"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
+-msgstr "ఉనికి తెలియదు"
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
+-msgstr "రేడియొ నిర్దేసించడంలో పొరబాటు. ఉంది/లేదు వాడనా ."
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/power.py:57
+-msgid "Error in automatic pm argument, use on/off."
+-msgstr "దానంతట అదేజరిగే విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/power.py:86
+-msgid "Error in extreme pm argument, use on/off."
+-msgstr "అమోఘమైన విద్యుత్తు నిర్వహణలో తప్పుజరింది, ఉంది/లేదు వాడు"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
+-msgstr "నాగురించి"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-#, fuzzy
+-msgid "Click to change your color:"
+-msgstr "రంగు మార్చడానికి నొక్కు"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
+-msgstr "నా ఎక్స్ ఒ గురించి"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
+-msgstr "ఉనికి"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
+-msgstr "వరుస సంఖ్య:"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
+-msgstr "సాఫ్ట్​వేర్"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
+-msgstr "బిల్డ్:"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
+-msgstr "ఫర్మ్​వేర్:"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
+-msgstr "తేదీ & కాలము"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
+-msgstr "కాలమానం"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
+-msgstr "ఫ్రేమ్"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
+-msgstr "ఎప్పుడూకాదు"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
+-msgstr "వెంటనే"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
+-msgstr "%s సెకనులు"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
+-msgstr "మొదలుపెట్టడంలో ఆలస్యమైంది"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "స్నేహం తీసివేయి"
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
+-msgstr "మూల"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "స్నేహం చేయి"
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
+-msgstr "అంచు"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "ఫూర్తిగా ఆపు"
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
+-msgstr "భాష"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
++msgstr "తిరిగి మొదలుపెట్టు"
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
+-msgstr "వల"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
+-msgstr "నిస్తం​త్రి"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
+-msgstr "రేడియే"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
++msgstr "%s కు పిలువు"
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
+-msgstr "మెష్ వల "
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
+-msgstr "శెర్వరు:"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
++msgstr "మొదలవుతుంది..."
+ 
+-#: ../src/controlpanel/view/power.py:27
+-msgid "Power"
+-msgstr "విద్యుత్తు "
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:51
+-msgid "Power management"
+-msgstr "విద్యుత్తు నిర్వహణ"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:61
+-msgid "Automatic power management (increases battery life)"
+-msgstr "దానంతట అదే విద్యుత్తు నిర్వహణ(బేటరీ ఆయువు పెంచుతుంది)"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
++msgstr "ఆపు"
+ 
+-#: ../src/controlpanel/view/power.py:89
+-msgid ""
+-"Extreme power management (disables wireless radio, increases battery life)"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+-"అమోఘమైన విద్యుత్తు నిర్వహణ( నిస్తం​త్రిని ఆపుతుంది, బేటరీ ఆయువు పెంచుతుంది)"
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
+-msgstr "బడి మెష్ పొర్టల్ తో జతచేయబడింది"
+-
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "బడి మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
++msgstr "విషయాలను చూపు"
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "ఎక్స్ఒ మెష్ పొర్టల్ తో జతచేయబడింది"
++#: ../src/jarabe/view/palettes.py:229
++#, fuzzy
++msgctxt "Volume"
++msgid "Remove"
++msgstr "తీసివేయి"
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "ఎక్స్ఒ మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
+-msgstr "సరళమైన మెష్ తో జత కుదిరింది"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
+-msgstr "సరళమైన మెష్ మొదలవుతుంది"
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
+-msgstr "తెలియని మెష్"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
++msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:210
+-msgid "Decline"
+-msgstr "నిరస్కరించు"
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:285
+-msgid "Registration Failed"
+-msgstr "రిజిస్టరుచేయడం విఫలమైంది"
++#: ../src/jarabe/util/emulator.py:40
++msgid "Sugar in a window"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:286
+ #, python-format
+-msgid "%s"
+-msgstr "%s"
++#~ msgid "Clipboard object: %s."
++#~ msgstr "క్లిప్ బోర్డు వస్తువు : %s."
+ 
+-#: ../src/view/home/favoritesview.py:288
+-msgid "Registration Successful"
+-msgstr "రిజిస్టరుచేయడం విజయవంతమైంది"
++#~ msgid "Encryption Type:"
++#~ msgstr "గుప్త్తీకరించే రకము:"
+ 
+-#: ../src/view/home/favoritesview.py:289
+-msgid "You are now registered with your school server."
+-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 "వేరుచేయి . . ."
+ 
+-#: ../src/view/home/favoritesview.py:405
+-msgid "Control Panel"
+-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 "వేరుచేయి . . ."
+ 
+-#: ../src/view/home/favoritesview.py:416
+-msgid "Restart"
+-msgstr "తిరిగి మొదలుపెట్టు"
++#, fuzzy
++#~ msgid "You must enter a server."
++#~ msgstr "మీరు పేరు నింపవలెను"
+ 
+-#: ../src/view/home/favoritesview.py:421
+-msgid "Shutdown"
+-msgstr "ఫూర్తిగా ఆపు"
++#~ msgid "About my XO"
++#~ msgstr "నా ఎక్స్ ఒ గురించి"
+ 
+-#: ../src/view/home/favoritesview.py:427
+-msgid "Register"
+-msgstr "దాఖలు చేయి"
++#~ msgid "Connected to a School Mesh Portal"
++#~ msgstr "బడి మెష్ పొర్టల్ తో జతచేయబడింది"
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
+-msgstr "మొదలవుతుంది..."
++#~ msgid "Looking for a School Mesh Portal..."
++#~ msgstr "బడి మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
+-msgstr "ఆపు"
++#~ msgid "Connected to an XO Mesh Portal"
++#~ msgstr "ఎక్స్ఒ మెష్ పొర్టల్ తో జతచేయబడింది"
+ 
+-#: ../src/view/palettes.py:104
+-msgid "Start"
+-msgstr "మొదలుపెట్టు"
++#~ msgid "Looking for an XO Mesh Portal..."
++#~ msgstr "ఎక్స్ఒ మెష్ పొర్టల్ కోసమై చూస్తున్నా..."
+ 
+-#: ../src/view/palettes.py:132
+-msgid "Remove favorite"
+-msgstr "ఇష్టమైనదానిని తొలగించు"
++#~ msgid "Connected to a Simple Mesh"
++#~ msgstr "సరళమైన మెష్ తో జత కుదిరింది"
+ 
+-#: ../src/view/palettes.py:136
+-msgid "Make favorite"
+-msgstr "ఇష్టమైనదానిగా తయారుచేయి"
++#~ msgid "Starting a Simple Mesh"
++#~ msgstr "సరళమైన మెష్ మొదలవుతుంది"
+ 
+-#: ../src/view/palettes.py:185
+-msgid "Show contents"
+-msgstr "విషయాలను చూపు"
++#~ msgid "Unknown Mesh"
++#~ msgstr "తెలియని మెష్"
+ 
+-#: ../src/view/palettes.py:209
+-#, python-format
+-msgid "%(free_space)d MB Free"
+-msgstr "%(free_space)d MB ఖాళీ"
++#~ 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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d second"
++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"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../extensions/deviceicon/network.py:656
+ #, python-format
+-msgid "Language for code=%s could not be determined."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple 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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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/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,502 +16,1698 @@ 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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/intro.py:94
+-msgid "Click to change color:"
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
+ msgstr ""
+ 
+-#: ../src/intro/intro.py:162
+-msgid "Next"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:91
+-#, python-format
+-msgid "Invite to %s"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ 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"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:212
+-#, python-format
+-msgid "Clipboard object: %s."
++#: ../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/hardware/keydialog.py:150
++#: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
++#: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:262
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:147
+-msgid "List view"
++#. 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/view/home/HomeBox.py:148
+-msgid "<Ctrl>L"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:204
+-msgid "Favorites view"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:205
+-msgid "<Ctrl>R"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:211
+-msgid "Freeform"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/HomeBox.py:218
+-msgid "Ring"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:152
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:116
+-#: ../src/view/devices/network/mesh.py:86
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:60
+-msgid "Resume"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:219
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:42
+-msgid "My Battery"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:111
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Very little power remaining"
++#: ../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/view/devices/battery.py:120
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:124
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:40
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:104
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:107
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:64
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:134
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:34
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
++#: ../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/cmd.py:26
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++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/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "sugar-control-panel: %s"
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:250
+-msgid "Changes require restart"
++#: ../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/gui.py:249
+-msgid "Warning"
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:253
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:257
+-msgid "Later"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:261
+-msgid "Restart now"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:67
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:70
+-#, python-format
+-msgid "stroke:   %s"
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../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/controlpanel/model/aboutme.py:74
++#: ../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 "fill:     %s"
++msgid "Error while copying the entry. %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:85
+-msgid "Error in specified color modifiers."
++#: ../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/model/aboutme.py:88
+-msgid "Error in specified colors."
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../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/controlpanel/model/language.py:104
++#: ../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 "Language for code=%s could not be determined."
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
++#: ../src/jarabe/journal/misc.py:274
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
++#: ../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/controlpanel/view/datetime.py:72
+-msgid "Timezone"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
++
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+-msgid "%s seconds"
++msgid "%(free_space)d MB Free"
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:108
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:110
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:115
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:120
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:127
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:224
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:351
+-msgid "Control Panel"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:362
+-msgid "Restart"
++#: ../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/view/home/favoritesview.py:367
++#: ../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,395 +15,92 @@ 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:"
+-
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
+-msgstr "Renk değiştirmek için tıkla:"
+-
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
+-msgstr "Geri"
+-
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
+-msgstr "Kapat"
+-
+-#: ../src/intro/window.py:192
+-msgid "Next"
+-msgstr "İleri"
+-
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
+-msgstr "Arkadaşı Kaldır"
+-
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
+-msgstr "Arkadaş Ekle"
+-
+-#: ../src/view/BuddyMenu.py:92
+-#, python-format
+-msgid "Invite to %s"
+-msgstr "Davet et %s"
+-
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
+-msgstr "Kaldır"
+-
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
+-msgstr "Aç"
+-
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
+-msgid "Keep"
+-msgstr "Kaydet"
+-
+-#: ../src/view/clipboardmenu.py:83
+-msgid "Open with"
+-msgstr "Birlikte Aç"
+-
+-#: ../src/view/clipboardmenu.py:228
+-#, python-format
+-msgid "%s clipping"
+-msgstr "%s Kırp"
+-
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "Tuş Çeşidi:"
+-
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "Kimlik Denetleme Çeşidi:"
+-
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "Şifreleme Çeşidi:"
+-
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
+-msgstr "Kayıt İçin Gerekli Bilgileri Sağlayamıyor"
+-
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
+-msgstr "Sunucuya Bağlanamıyor"
+-
+-#: ../src/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
+-msgstr "Sunucu İsteği Tamamlayamıyor"
+-
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
+-msgstr "Ekran Resmi"
+-
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
+-msgstr "Silmeyi Onayla"
+-
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr "Silme Onayı: %s i tamamen silmek mi istiyorsunuz?"
+-
+-#: ../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"
+-
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
+-msgstr "Yazılım Güncelleme"
+-
+-#: ../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"
+-
+-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "İptal"
+-
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
+-msgstr "Daha Sonra"
+-
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
+-msgstr "Şimdi Kontrol Et"
+-
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
+-msgstr "Liste Görünümü"
+-
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
+-msgstr "<Ctrl>2"
+-
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
+-msgstr "Favoriler Görünümü"
+-
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
+-msgstr "<Ctrl>1"
+-
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-msgstr "Bağlan"
+-
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
+-msgstr "Bağlantıyı kes"
+-
+-# 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..."
+-
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
+-msgstr "Bağlanıyor..."
+-
+-# TODO: show the channel number
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
+-msgstr "Bağlı"
+-
+-#: ../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ğı"
+-
+-# 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..."
+-
+-#. 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"
+-
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
+-msgstr "Katıl"
+-
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
+-msgstr "Pil Durumu"
+-
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
+-msgstr "Şarj"
+-
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
+-msgstr "Çok az şarj kaldı"
+-
+-#: ../src/view/devices/battery.py:123
+-#, python-format
+-msgid "%(hour)d:%(min).2d remaining"
+-msgstr "%(hour)d:%(min).2d kaldı"
+-
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
+-msgstr "Şarj edildi"
+-
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
+-msgstr "Hoparlör"
+-
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
+-msgstr "Sesi açık"
+-
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
+-msgstr "Sessiz"
+-
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
+-msgstr "Bağlantı kesildi"
+-
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
+-msgstr "Kanal"
+-
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
+-msgstr "Komşular"
+-
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
+-msgstr "Grup"
+-
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
+-msgstr "Ana ekran"
+-
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
+-msgstr "Aktivite"
+-
+-#: ../src/controlpanel/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
+-msgstr ""
+-"sugar-kontrol-paneli: UYARI, aynı isimle birden fazla seçenek buldu: %s "
+-"birim: %r"
+-
+-#: ../src/controlpanel/cmd.py:28
+-#, 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
+-#, 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
+-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 ""
+-"Kullanım: sugar-kontrol-paneli [ seçenek ] anahtar [ args ... ] \n"
+-"Sugar ortamı için kontrol \n"
+-"Seçenekler:\n"
+-"-h Bu yardım mesajını göster ve çık \n"
+-"-l Tüm uygun seçenekleri listele \n"
+-"-h anahtarı Bu anahtar hakkındaki bilgileri göster \n"
+-"-g anahtarı  Bu anahtarın son değerini al \n"
+-"-s anahtarı  Bu anahtarın son değerini kur \n"
+-"\t"
+-
+-#: ../src/controlpanel/cmd.py:48
+-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/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-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
+-msgid "Cancel changes"
+-msgstr "Değişiklikleri İptal Et"
+-
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
+-msgstr "Şimdi Tekrar Başlat"
++#: ../extensions/cpsection/aboutme/__init__.py:24
++msgid "About Me"
++msgstr "Benim Hakkımda"
+ 
+-#: ../src/controlpanel/aboutme/model.py:44
++#: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+ msgstr "Bir isim girmeniz gerekiyor"
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
++#: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+ msgid "stroke:   color=%s hue=%s"
+ msgstr "fırça darbesi:_  renk=%s renk=%s"
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
++#: ../extensions/cpsection/aboutme/model.py:78
+ #, python-format
+ msgid "stroke:   %s"
+ msgstr "fırça darbesi:_  %s"
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
++#: ../extensions/cpsection/aboutme/model.py:80
+ #, python-format
+ msgid "fill:     color=%s hue=%s"
+ msgstr "doldurma:_    renk=%s renk=%s"
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
++#: ../extensions/cpsection/aboutme/model.py:82
+ #, python-format
+ msgid "fill:     %s"
+ msgstr "doldurma:_    %s"
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
++#: ../extensions/cpsection/aboutme/model.py:94
+ msgid "Error in specified color modifiers."
+ msgstr "Belirtilen renk değiştiricilerinde hata"
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
++#: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+ msgstr "Belirtilen renklerde hata"
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
+-msgstr "Benim Hakkımda"
+-
+-#: ../src/controlpanel/aboutme/view.py:134
++#: ../extensions/cpsection/aboutme/view.py:235
+ msgid "Click to change your color:"
+ msgstr "Renk değiştirmek için tıklayınız:"
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
++#: ../extensions/cpsection/aboutcomputer/__init__.py:21
++msgid "About my Computer"
++msgstr ""
++
++#: ../extensions/cpsection/aboutcomputer/model.py:42
+ msgid "Not available"
+ msgstr "Mevcut değil"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
++#: ../extensions/cpsection/aboutcomputer/model.py:171
++#, python-format
++msgid "%(interface)s: %(version)s"
++msgstr ""
++
++#: ../extensions/cpsection/aboutcomputer/view.py:61
+ msgid "Identity"
+ msgstr "Kimlik"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
++#: ../extensions/cpsection/aboutcomputer/view.py:70
+ msgid "Serial Number:"
+ msgstr "Seri Numarası:"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
++#: ../extensions/cpsection/aboutcomputer/view.py:92
+ msgid "Software"
+ msgstr "Yazılım"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
++#: ../extensions/cpsection/aboutcomputer/view.py:101
+ msgid "Build:"
+ msgstr "Yapı:"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:111
++#: ../extensions/cpsection/aboutcomputer/view.py:116
+ msgid "Sugar:"
+ msgstr "Sugar:"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:126
++#: ../extensions/cpsection/aboutcomputer/view.py:132
+ msgid "Firmware:"
+ msgstr "Aygıt Yazılımı:"
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
++#: ../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"
+ 
+-#: ../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/controlpanel/aboutxo/view.py:163
++#: ../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 "
+@@ -415,382 +112,1692 @@ msgstr ""
+ "değiştirebilir ve/veya burada açıklanan belli koşullar altında kopyasını "
+ "dağıtabilirsiniz."
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
++#: ../extensions/cpsection/aboutcomputer/view.py:200
+ msgid "Full license:"
+ msgstr "Tam Lisans:"
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
+-msgstr "XO Bilgisayarım Hakkında"
++#: ../extensions/cpsection/datetime/__init__.py:21
++msgid "Date & Time"
++msgstr "Tarih ve Zaman"
+ 
+-#: ../src/controlpanel/datetime/model.py:89
++#: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+ msgstr "Hatalı zaman dilimi yok"
+ 
+-#: ../src/controlpanel/datetime/view.py:68
++#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+ msgstr "Saat Dilimi"
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
+-msgstr "Tarih ve Zaman"
++#: ../extensions/cpsection/frame/__init__.py:21
++msgid "Frame"
++msgstr "Çerçeve"
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
+ msgid "Value must be an integer."
+ msgstr "Değer bir tamsayı olmalı"
+ 
+-#: ../src/controlpanel/frame/view.py:26
++#: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+ msgstr "asla"
+ 
+-#: ../src/controlpanel/frame/view.py:27
++#: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+ msgstr "anlık"
+ 
+-#: ../src/controlpanel/frame/view.py:28
++#: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+ msgid "%s seconds"
+ msgstr "%s saniyeler"
+ 
+-#: ../src/controlpanel/frame/view.py:52
++#: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+ msgstr "Aktivasyon Gecikmesi"
+ 
+-#: ../src/controlpanel/frame/view.py:76
++#: ../extensions/cpsection/frame/view.py:78
+ msgid "Corner"
+ msgstr "Köşe"
+ 
+-#: ../src/controlpanel/frame/view.py:111
++#: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+ msgstr "Kenar"
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
+-msgstr "Çerçeve"
++#: ../extensions/cpsection/keyboard/__init__.py:21
++#: ../extensions/cpsection/keyboard/view.py:32
++msgid "Keyboard"
++msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "~/.i18n e girilemiyor. Standart ayarları oluşturunuz"
++#: ../extensions/cpsection/keyboard/view.py:190
++msgid "Keyboard Model"
++msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
++#: ../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 "Dil"
++
++#: ../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 "Language for code=%s could not be determined."
+ msgstr "kod=%s için dil tanımlanamadı"
+ 
+-#: ../src/controlpanel/language/model.py:131
++#: ../extensions/cpsection/language/model.py:152
+ #, 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"
++#: ../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 "Ağ"
+ 
+-#: ../src/controlpanel/network/model.py:62
++#: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+ msgstr "Durum bilinmiyor"
+ 
+-#: ../src/controlpanel/network/model.py:82
++#: ../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/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
+-msgstr "Ağ"
++#: ../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"
+ 
+-#: ../src/controlpanel/network/view.py:54
++#: ../extensions/cpsection/network/view.py:61
+ msgid "Wireless"
+ msgstr "Kablosuz Bağlantı"
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../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."
+ 
+-#: ../src/controlpanel/network/view.py:75
++#: ../extensions/cpsection/network/view.py:82
+ msgid "Radio"
+ msgstr "Bağlantı "
+ 
+-#: ../src/controlpanel/network/view.py:91
++#: ../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/controlpanel/network/view.py:100
++#: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+ msgstr "Ağ geçmişini siliniz."
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
+-msgstr "Mesh"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
++msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:122
++#: ../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:"
+ 
+-#: ../src/controlpanel/power/model.py:55
++#: ../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"
+ 
+-#: ../src/controlpanel/power/model.py:84
++#: ../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"
+ 
+-#: ../src/controlpanel/power/view.py:47
++#: ../extensions/cpsection/power/view.py:48
+ msgid "Power management"
+ msgstr "Güç Kontrolü"
+ 
+-#: ../src/controlpanel/power/view.py:57
++#: ../extensions/cpsection/power/view.py:58
+ msgid "Automatic power management (increases battery life)"
+ msgstr "Otomatik güç kontrolü (pil ömrünü uzatır)"
+ 
+-#: ../src/controlpanel/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 ""
+ "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üç"
++#: ../extensions/cpsection/updater/__init__.py:21
++#, fuzzy
++msgid "Software update"
++msgstr "Yazılım Güncelleme"
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
+-msgstr "Okul Mesh Ağı Portalı'na bağlandı."
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "Okul Mesh Ağı Portalı arıyor..."
++#: ../extensions/cpsection/updater/view.py:125
++#, python-format
++msgid "Checking %s..."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "XO Mesh Ağı Portalı'na bağlandı."
++#: ../extensions/cpsection/updater/view.py:127
++#, python-format
++msgid "Downloading %s..."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "XO Mesh Ağ Portalı arıyor..."
++#: ../extensions/cpsection/updater/view.py:129
++#, python-format
++msgid "Updating %s..."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
+-msgstr "Sadece Mesh Ağına bağlandı."
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
+-msgstr "Sadece Mesh Ağı başlatıyor."
++#: ../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] ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
+-msgstr "Bilinmeyen Mesh Ağı"
++#: ../extensions/cpsection/updater/view.py:159
++msgid "Checking for updates..."
++msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
+-msgstr "Azalmak"
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
++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"
++#: ../extensions/cpsection/updater/view.py:173
++#, python-format
++msgid "%s update was installed"
++msgid_plural "%s updates were installed"
++msgstr[0] ""
++msgstr[1] ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
+-msgstr "çember görünümü"
++#: ../extensions/cpsection/updater/view.py:255
++msgid "Install selected"
++msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
+-msgstr "sarmal"
++#: ../extensions/cpsection/updater/view.py:276
++#, python-format
++msgid "Download size: %s"
++msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
+-msgstr "kutu"
++#: ../extensions/cpsection/updater/view.py:364
++#, python-format
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
++msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
+-msgstr "üçgen"
++#. TRANS: download size is 0
++#: ../extensions/cpsection/updater/view.py:382
++#, fuzzy
++msgid "None"
++msgstr "Kapat"
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
+-msgstr "Kayıt Başarısız"
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%s"
+-msgstr "%s"
++msgid "%.0f KB"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
+-msgstr "Kayıt Başarılı"
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
++#, python-format
++msgid "%.1f MB"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
+-msgstr "Şu an okul sunucunuza kayıt oldunuz"
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr "Pil Durumu"
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
+-msgstr "Ayarlar"
++#: ../extensions/deviceicon/battery.py:147
++#, fuzzy
++msgid "Removed"
++msgstr "Kaldır"
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
+-msgstr "Yeniden Başlat"
++#: ../extensions/deviceicon/battery.py:150
++msgid "Charging"
++msgstr "Şarj"
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
+-msgstr "Kapat"
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr "Çok az şarj kaldı"
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
+-msgstr "Kaydol"
++#: ../extensions/deviceicon/battery.py:158
++#, python-format
++msgid "%(hour)d:%(min).2d remaining"
++msgstr "%(hour)d:%(min).2d kaldı"
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
+-msgstr "Başlıyor..."
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr "Şarj edildi"
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
+-msgstr "Durdur"
++#: ../extensions/deviceicon/network.py:49
++#, python-format
++msgid "IP address: %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"
++#: ../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"
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
+-msgstr "Favorilerimden kaldır"
++#: ../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..."
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
+-msgstr "Favorilerime ekle"
++# 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ı"
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
+-msgstr "İçeriklerini göster"
++#: ../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 ""
+ 
+-#: ../src/view/palettes.py:215
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "%(free_space)d MB Free"
+-msgstr "%(free_space)d MB boş"
++msgid "Error: %s"
++msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
+-msgstr "Arama"
++#: ../extensions/deviceicon/network.py:340
++#, python-format
++msgid "Suggestion: %s"
++msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
+-msgstr "Herhangi bir zaman"
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
+-msgstr "Bugün"
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
++#, python-format
++msgid "%d KB"
++msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
+-msgstr "Dünden itibaren"
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
+-msgstr "Geçen hafta"
++#: ../extensions/deviceicon/network.py:364
++msgid "Check your Access Point Name (APN) configuration"
++msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
+-msgstr "Geçen ay"
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
+-msgstr "Geçen yıl"
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
+-msgstr "Herhangi biri"
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "Mesh Ağı"
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
+-msgstr "Arkadaşlarım"
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "Mesh Ağı"
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
+-msgstr "Sınıfım"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
+-msgstr "Herhangi bir şey"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
+-msgstr "Kopyala"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr "Hoparlör"
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
+-msgstr "İsimsiz"
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
++msgstr "Sesi açık"
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
+-msgstr "Günlük"
++#: ../extensions/deviceicon/speaker.py:141
++msgid "Mute"
++msgstr "Sessiz"
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
+-msgstr "Ön izleme yok"
++#: ../extensions/deviceicon/touchpad.py:38
++msgid "finger"
++msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
+-msgstr "Katılımcılar:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
++msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
+-msgstr "Tanım:"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
++msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
+-msgstr "Etiketler:"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
++msgstr "Mesh"
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
+-msgstr "Bir nesne seçiniz"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
++msgstr "Grup"
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
+-msgstr "Kapat"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Ana ekran"
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
+-msgstr "Bağlantıyı kaldır"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr "Aktivite"
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
+-msgstr "Tarih yok"
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr "Ekran Resmi"
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
+-msgstr "Günlüğünüz boş"
++#: ../extensions/globalkey/screenshot.py:74
++#, python-format
++msgid "Screenshot of \"%s\""
++msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
+-msgstr "Eşleşen bir giriş yok_"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
++msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
+-msgstr "Günlüğünüz dolu"
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
++msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ 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
+-msgid "Show Journal"
+-msgstr "Günlüğü göster"
++#: ../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 ""
++"sugar-kontrol-paneli: UYARI, aynı isimle birden fazla seçenek buldu: %s "
++"birim: %r"
++
++#: ../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/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/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 ""
++"Kullanım: sugar-kontrol-paneli [ seçenek ] anahtar [ args ... ] \n"
++"Sugar ortamı için kontrol \n"
++"Seçenekler:\n"
++"-h Bu yardım mesajını göster ve çık \n"
++"-l Tüm uygun seçenekleri listele \n"
++"-h anahtarı Bu anahtar hakkındaki bilgileri göster \n"
++"-g anahtarı  Bu anahtarın son değerini al \n"
++"-s anahtarı  Bu anahtarın son değerini kur \n"
++"\t"
++
++#: ../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/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/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/jarabe/controlpanel/gui.py:300
++msgid "Cancel changes"
++msgstr "Değişiklikleri İptal Et"
++
++#: ../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/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
++msgid "Done"
++msgstr "Kapat"
++
++#: ../src/jarabe/controlpanel/toolbar.py:125
++#: ../src/jarabe/desktop/favoritesview.py:347
++msgid "Ok"
++msgstr "Tamam"
++
++#: ../src/jarabe/desktop/activitieslist.py:230
++#, python-format
++msgid "Version %s"
++msgstr ""
++
++#: ../src/jarabe/desktop/activitieslist.py:356
++msgid "Confirm erase"
++msgstr "Silmeyi Onayla"
++
++#: ../src/jarabe/desktop/activitieslist.py:358
++#, python-format
++msgid "Confirm erase: Do you want to permanently erase %s?"
++msgstr "Silme Onayı: %s i tamamen silmek mi istiyorsunuz?"
++
++#: ../src/jarabe/desktop/activitieslist.py:362
++#: ../src/jarabe/frame/clipboardmenu.py:67
++#: ../src/jarabe/view/viewsource.py:280
++msgid "Keep"
++msgstr "Kaydet"
++
++#: ../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/jarabe/desktop/activitieslist.py:435
++msgid "Remove favorite"
++msgstr "Favorilerimden kaldır"
++
++#: ../src/jarabe/desktop/activitieslist.py:439
++msgid "Make favorite"
++msgstr "Favorilerime ekle"
++
++#. 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"
++
++#. TRANS: label for the ring layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:215
++msgid "Ring"
++msgstr "çember görünümü"
++
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
++msgstr "sarmal"
++
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
++msgstr "kutu"
++
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
++msgstr "üçgen"
++
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
++msgstr "Kayıt Başarısız"
++
++#: ../src/jarabe/desktop/favoritesview.py:339
++#, python-format
++msgid "%s"
++msgstr "%s"
++
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
++msgstr "Kayıt Başarılı"
++
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
++msgstr "Şu an okul sunucunuza kayıt oldunuz"
++
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
++msgstr "Kaydol"
++
++#: ../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 "Yazılım Güncelleme"
++
++#: ../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/jarabe/desktop/homebox.py:76
++msgid "Check now"
++msgstr "Şimdi Kontrol Et"
++
++#: ../src/jarabe/desktop/homebox.py:197
++msgid "List view"
++msgstr "Liste Görünümü"
++
++#: ../src/jarabe/desktop/homebox.py:198
++msgid "<Ctrl>2"
++msgstr "<Ctrl>2"
++
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
++msgstr "Favoriler Görünümü"
++
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
++msgstr "<Ctrl>1"
++
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
++msgstr "Tuş Çeşidi:"
++
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
++msgstr "Kimlik Denetleme Çeşidi:"
++
++#: ../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 "Devam Et"
++
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
++msgstr "Katıl"
++
++#: ../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 Ağı"
++
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
++msgstr "Sunucuya Bağlanamıyor"
++
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
++msgstr "Sunucu İsteği Tamamlayamıyor"
++
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
++msgstr "Azalmak"
++
++#: ../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 "Kaldır"
++
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
++msgstr "Aç"
++
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
++msgstr "Birlikte Aç"
++
++#: ../src/jarabe/frame/clipboardobject.py:50
++#, python-format
++msgid "%s clipping"
++msgstr "%s Kırp"
++
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
++msgstr "Komşular"
++
++#: ../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 "İsim:"
++
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
++msgstr "Renk değiştirmek için tıkla:"
++
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
++msgstr "Geri"
++
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
++msgstr "İleri"
++
++#: ../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/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr "Ön izleme yok"
++
++#: ../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 "Tarih yok"
++
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
++msgstr "Katılımcılar:"
++
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
++msgstr "Tanım:"
++
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
++msgstr "Etiketler:"
++
++#: ../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/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
++msgstr "Arama"
++
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
++msgstr "Herhangi bir zaman"
++
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
++msgstr "Bugün"
++
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
++msgstr "Dünden itibaren"
++
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
++msgstr "Geçen hafta"
++
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
++msgstr "Geçen ay"
++
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
++msgstr "Geçen yıl"
++
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
++msgstr "Herhangi biri"
++
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
++msgstr "Arkadaşlarım"
++
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
++msgstr "Sınıfım"
++
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
++msgstr "Herhangi bir şey"
++
++#: ../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 "Başlat"
++
++#: ../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 "Günlüğünüz boş"
++
++#: ../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/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/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/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,587 +15,1778 @@ 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 "ميرے بارے ميں"
++
++#: ../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 "سٹروک:   رنگ=%s ہيو=%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 "بھر ديں:     رنگ=%s ہيو=%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
++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 "Software"
++
++#: ../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 "%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 "رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں."
++
++#: ../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
++#, 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 ""
++
++#: ../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 "ميری بيٹری"
++
++#: ../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 ""
++
++#: ../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/intro/intro.py:94
+-msgid "Click to change color:"
+-msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
++msgstr "ان ميوٹ"
+ 
+-#: ../src/intro/intro.py:145
+-msgid "Back"
+-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 "شوگر-کنٹرول-پينل:ايک ہی نام کے ساتھہ کافی آپشن ملی ہيں: %s موڈيول: %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
++#, fuzzy
++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"
++"   "
++
++#: ../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/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
++#: ../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/intro/intro.py:162
+-msgid "Next"
+-msgstr "آگے"
++#: ../src/jarabe/controlpanel/toolbar.py:125
++#: ../src/jarabe/desktop/favoritesview.py:347
++msgid "Ok"
++msgstr "ٹھیک ہے"
+ 
+-#: ../src/view/BuddyMenu.py:58
+-msgid "Remove friend"
+-msgstr "دوست کو ہٹائيں"
++#: ../src/jarabe/desktop/activitieslist.py:230
++#, python-format
++msgid "Version %s"
++msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:61
+-msgid "Make friend"
+-msgstr "دوست بنائيں"
++#: ../src/jarabe/desktop/activitieslist.py:356
++msgid "Confirm erase"
++msgstr "مٹانا کنفرم کريں"
+ 
+-#: ../src/view/BuddyMenu.py:91
++#: ../src/jarabe/desktop/activitieslist.py:358
+ #, python-format
+-msgid "Invite to %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/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 "پليٹ"
+ 
+-#: ../src/view/clipboardmenu.py:48
+-msgid "Remove"
+-msgstr "ہٹائيں"
++#. TRANS: label for the spiral layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:402
++msgid "Spiral"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+-msgid "Open"
+-msgstr "کھوليں"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:472
++msgid "Box"
++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 "رکھيں"
++#. TRANS: label for the box layout in the favorites view
++#: ../src/jarabe/desktop/favoriteslayout.py:515
++msgid "Triangle"
++msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:84
+-msgid "Open with"
+-msgstr "اس کے ساتھہ کھولیں"
++#: ../src/jarabe/desktop/favoritesview.py:338
++msgid "Registration Failed"
++msgstr "رجسٹريشن نہيں ہوئی"
+ 
+-#: ../src/view/clipboardmenu.py:216
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "Clipboard object: %s."
+-msgstr "کلپ بورڈ آبجیکٹ: %s."
++msgid "%s"
++msgstr "%s"
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
+-msgstr "اصل قسم:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
++msgstr "رجسٹريشن ہو گئی"
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
+-msgstr "اجاذت دينے کی قسم:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
++msgstr "اب آپ اپنے سکول سرور کے ساتھہ رجسٹرڈ ہيں۔"
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
+-msgstr "خفیہ کاری قسم:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
++msgstr "رجسٹر کريں"
+ 
+-#: ../src/view/Shell.py:240
+-msgid "Screenshot"
+-msgstr "سکرين شاٹ"
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-msgid "Confirm erase"
+-msgstr "مٹانا کنفرم کريں"
++#: ../src/jarabe/desktop/homebox.py:66
++msgid "Software Update"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:82
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr "مٹانا تصدیق کريں: کيا آپ مستقل طور پر اس کو مٹانا چاھتے ہيں %s؟"
++#: ../src/jarabe/desktop/homebox.py:67
++msgid "Update your activities to ensure compatibility with your new software"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:89 ../src/view/palettes.py:120
+-msgid "Erase"
+-msgstr "مٹائيں"
++#: ../src/jarabe/desktop/homebox.py:76
++msgid "Check now"
++msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:215
++#: ../src/jarabe/desktop/homebox.py:197
+ msgid "List view"
+ msgstr "فہرست نظارہ"
+ 
+-#: ../src/view/home/HomeBox.py:216
++#: ../src/jarabe/desktop/homebox.py:198
+ msgid "<Ctrl>2"
+ msgstr "<Ctrl>2"
+ 
+-#: ../src/view/home/HomeBox.py:273
++#: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+ msgstr "پسندیدگان نظارہ"
+ 
+-#: ../src/view/home/HomeBox.py:274
++#: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+ msgstr "<Ctrl>1"
+ 
+-# TRANS: label for the freeform layout in the favorites view
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/HomeBox.py:282
+-msgid "Freeform"
+-msgstr "فری فارم"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
++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 "پليٹ"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
++msgstr "اجاذت دينے کی قسم:"
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
+-msgstr "کنيکٹ"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
+-msgstr "منقطع کریں"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
++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 "رابطہ کٹ رہا ہے۔۔۔"
++#. 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 "پھر شروع کريں"
+ 
+-# 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 "کنيکشن مل رہا ہے۔۔۔"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
++msgstr "شرکت کريں"
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connected"
+-msgstr "کنيکشن ہو گيا ہے"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
++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"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format, fuzzy
++msgid "Mesh Network %d"
+ 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 "کٹ کريں۔۔۔"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
+-msgid "Resume"
+-msgstr "پھر شروع کريں"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
++msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:205
+-msgid "Join"
+-msgstr "شرکت کريں"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
++msgstr "منظور نہیں ہوا"
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
+-msgstr "ميری بيٹری"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
+-msgstr "چارج کر رہا ہے"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
+-msgstr "پاور بہت کم رہ گئی ہے"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/activitiestray.py:544
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
+-msgstr "%(hour)d:%(min).2d رہ گئے ہيں"
++msgid "%s of %s"
++msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
+-msgstr "چارج ہو گئی ہے"
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
+-msgstr "ميرے سپيکرز"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:119
+-msgid "Unmute"
+-msgstr "ان ميوٹ"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
++msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:122
+-msgid "Mute"
+-msgstr "ميوٹ"
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
+-msgstr "منقطع ہو گیا"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
++msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:137
+-msgid "Channel"
+-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/view/frame/zoomtoolbar.py:34
++#: ../src/jarabe/frame/clipboardobject.py:50
++#, python-format
++msgid "%s clipping"
++msgstr ""
++
++#: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "Neighborhood"
+ msgstr "ميرے پڑوسی"
+ 
+-#: ../src/view/frame/zoomtoolbar.py:36
+-msgid "Group"
+-msgstr "گروپ"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:38
+-msgid "Home"
+-msgstr "گھر"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
++msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:40
+-msgid "Activity"
+-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/controlpanel/cmd.py:26
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
++msgstr ""
++
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
+-msgstr "شوگر-کنٹرول-پينل:ايک ہی نام کے ساتھہ کافی آپشن ملی ہيں: %s موڈيول: %r"
++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/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr "شوگر-کنٹرول-پينل: کی=%s يہ آپشن موجود نہيں ہے"
++msgid "Date: %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
++#: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr "شوگر-کنٹرول-پينل:%s "
++msgid "Size: %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:33
+-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"
+-"    "
++#: ../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 ""
+-"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"
+-"   "
+ 
+-#: ../src/controlpanel/cmd.py:45
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "نئی تبديلیاں عمل میں لانے کے لیے آپ کو شوگر پھر شروع کرنا ہو گا۔\n"
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
+-msgstr "منسوخ کريں"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
++msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:294
+-msgid "Ok"
+-msgstr "ٹھیک ہے"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
++msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:260
+-msgid "Changes require restart"
+-msgstr "دوبارہ چلا کر تبديلياں عمل ميں لائيں"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:259
+-msgid "Warning"
+-msgstr "وارننگ"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:263
+-msgid "Cancel changes"
+-msgstr "تبديلياں ختم کريں"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:267
+-msgid "Later"
+-msgstr "بعد ميں"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
++msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:271
+-msgid "Restart now"
+-msgstr "ابھی دوبارہ چلائيں"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:44
+-msgid "You must enter a name."
+-msgstr "آپ کو ضرور ايک نام دينا ہے"
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
+-msgstr "سٹروک:   رنگ=%s ہيو=%s"
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:72
+-#, python-format
+-msgid "stroke:   %s"
+-msgstr "سٹروک:   %s"
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
+-msgstr "بھر ديں:     رنگ=%s ہيو=%s"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:76
+-#, python-format
+-msgid "fill:     %s"
+-msgstr "بھر ديں:     %s"
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:87
+-msgid "Error in specified color modifiers."
+-msgstr "اختصاص کردہ رنگ ترمیم کاروں میں نقص۔"
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/aboutme.py:90
+-msgid "Error in specified colors."
+-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/controlpanel/model/aboutxo.py:24
+-msgid "Not available"
+-msgstr "دستیاب نہيں"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/datetime.py:85
+-msgid "Error timezone does not exist."
+-msgstr "نقص، ٹائیم زون موجود نہیں ہے۔"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+-msgid "Value must be an integer."
+-msgstr "انٹيجر ويليو ہونی چاھيے۔"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں."
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:104
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "کوڈ=%s کی زبان تعین نہیں کی جا سکی۔"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
++msgstr ""
+ 
+-#: ../src/controlpanel/model/language.py:121
++#: ../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'."
+-msgstr "معاف کيجيے ميں '%s' نہيں بولتا/بولتی۔"
+-
+-#: ../src/controlpanel/model/network.py:48
+-msgid "You must enter a server."
+-msgstr "ايک سکول سرور ضرور لکھیں۔"
++msgid "%(free_space)d MB Free"
++msgstr "%(free_space)d MB dخالی"
+ 
+-#: ../src/controlpanel/model/network.py:63
+-msgid "State is unknown."
+-msgstr "نامعلوم حالت"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/network.py:83
+-msgid "Error in specified radio argument use on/off."
+-msgstr "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/power.py:57
+-msgid "Error in automatic pm argument, use on/off."
+-msgstr "خودکار pm برہان میں نقص، آن/آف استعمال کریں۔"
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/model/power.py:86
+-msgid "Error in extreme pm argument, use on/off."
+-msgstr "ایکسٹریم pm برہان میں نقص، آن/آف استعمال کریں۔"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:32
+-msgid "About Me"
+-msgstr "ميرے بارے ميں"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutme.py:134
+-msgid "Click to change your color:"
+-msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:26
+-msgid "About my XO"
+-msgstr "ميرے XO کے بارے ميں"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:47
+-msgid "Identity"
+-msgstr "پہچان"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:56
+-msgid "Serial Number:"
+-msgstr "سيريل نمبر:"
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:79
+-msgid "Software"
+-msgstr "Software"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:88
+-msgid "Build:"
+-msgstr "سسٹم:"
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/aboutxo.py:103
+-msgid "Firmware:"
+-msgstr "فرم ویئر"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:29
+-msgid "Date & Time"
+-msgstr "تاريخ & وقت"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/datetime.py:72
+-msgid "Timezone"
+-msgstr "ٹائم زون"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:28
+-msgid "Frame"
+-msgstr "فريم"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:30
+-msgid "never"
+-msgstr "کبھی نہیں"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:31
+-msgid "instantaneous"
+-msgstr "اچانک"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:32
+-#, python-format
+-msgid "%s seconds"
+-msgstr "%s سيکنڈ"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:56
+-msgid "Activation Delay"
+-msgstr "ايکٹيويشن وقفہ"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:80
+-msgid "Corner"
+-msgstr "کونہ"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/frame.py:115
+-msgid "Edge"
+-msgstr "کنارہ"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/language.py:29
+-#: ../src/controlpanel/view/language.py:74
+-msgid "Language"
+-msgstr "زبان"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:28
+-msgid "Network"
+-msgstr "نيٹ ورک"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:53
+-msgid "Wireless"
+-msgstr "وائيرليس"
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:61
+-msgid "Radio:"
+-msgstr "ریڈيو:"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:94
+-msgid "Mesh"
+-msgstr "ميش"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/network.py:103
+-msgid "Server:"
+-msgstr "سکول سرور:"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:27
+-msgid "Power"
+-msgstr "پاور"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:51
+-msgid "Power management"
+-msgstr "پاور کنٹرول"
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:61
+-msgid "Automatic power management (increases battery life)"
+-msgstr "آٹو ميٹک پاور کنٹرول(بیٹری کا دورانيہ ذيادہ کرنے کے ليے)"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr ""
+ 
+-#: ../src/controlpanel/view/power.py:89
+-msgid ""
+-"Extreme power management (disables wireless radio, increases battery life)"
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
+-msgstr "سکول کے ميش پورٹل کے ساتھہ ملا ہوا ہے"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
+-msgstr " سکول ميش پورٹل ڈھونڈ رہا ہے ..."
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "‌XO ميش پورٹل کے ساتھہ جڑا ہوا ہے"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "XO ميش پورٹل ڈھونڈ رہا ہے ..."
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
+-msgstr "سادہ ميش کے ساتھ جڑا ہوا ہے"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
+-msgstr "سادہ ميش شروع کر رہا ہے"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
++msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
+-msgstr "نامعلوم ميش"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:210
+-msgid "Decline"
+-msgstr "منظور نہیں ہوا"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:285
+-msgid "Registration Failed"
+-msgstr "رجسٹريشن نہيں ہوئی"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:286
+-#, python-format
+-msgid "%s"
+-msgstr "%s"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:288
+-msgid "Registration Successful"
+-msgstr "رجسٹريشن ہو گئی"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
++msgstr "دوست کو ہٹائيں"
+ 
+-#: ../src/view/home/favoritesview.py:289
+-msgid "You are now registered with your school server."
+-msgstr "اب آپ اپنے سکول سرور کے ساتھہ رجسٹرڈ ہيں۔"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
++msgstr "دوست بنائيں"
+ 
+-#: ../src/view/home/favoritesview.py:405
+-msgid "Control Panel"
+-msgstr "کنٹرول پينل"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "بند کريں"
+ 
+-#: ../src/view/home/favoritesview.py:416
++#: ../src/jarabe/view/buddymenu.py:95
+ msgid "Restart"
+ msgstr "دوبارہ چلائيں"
+ 
+-#: ../src/view/home/favoritesview.py:421
+-msgid "Shutdown"
+-msgstr "بند کريں"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
++msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:427
+-msgid "Register"
+-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/view/palettes.py:42
++#: ../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 ""
++
++#: ../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 ""
+ 
+-#: ../src/intro/window.py:125
+-msgid "Click to change color:"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
+-msgid "Back"
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
+-msgid "Done"
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
+ msgstr ""
+ 
+-#: ../src/intro/window.py:192
+-msgid "Next"
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:60
+-msgid "Remove friend"
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:63
+-msgid "Make friend"
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "Activity"
++msgstr ""
++
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
+ msgstr ""
+ 
+-#: ../src/view/BuddyMenu.py:92
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Invite to %s"
++msgid "Screenshot of \"%s\""
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:51
+-msgid "Remove"
++#: ../data/sugar.schemas.in.h:1
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
+ 
+-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
+-msgid "Open"
++#: ../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 ""
+ 
+-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
++#: ../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/view/clipboardmenu.py:83
+-msgid "Open with"
++#: ../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/view/clipboardmenu.py:228
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+-msgid "%s clipping"
++msgid "%s"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:150
+-msgid "Key Type:"
++#: ../src/jarabe/desktop/favoritesview.py:341
++msgid "Registration Successful"
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:170
+-msgid "Authentication Type:"
++#: ../src/jarabe/desktop/favoritesview.py:342
++msgid "You are now registered with your school server."
+ msgstr ""
+ 
+-#: ../src/hardware/keydialog.py:251
+-msgid "Encryption Type:"
++#: ../src/jarabe/desktop/favoritesview.py:641
++msgid "Register"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:17
+-msgid "Cannot obtain data needed for registration."
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
+ msgstr ""
+ 
+-#: ../src/hardware/schoolserver.py:31
+-msgid "Cannot connect to the server."
++#: ../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/hardware/schoolserver.py:36
+-msgid "The server could not complete the request."
++#: ../src/jarabe/desktop/homebox.py:253
++msgid "Favorites view"
+ msgstr ""
+ 
+-#: ../src/view/Shell.py:251
+-msgid "Screenshot"
++#: ../src/jarabe/desktop/homebox.py:254
++msgid "<Ctrl>1"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:78
+-msgid "Confirm erase"
++#: ../src/jarabe/desktop/keydialog.py:143
++msgid "Key Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:80
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
++#: ../src/jarabe/desktop/keydialog.py:163
++msgid "Authentication Type:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
+-msgid "Erase"
++#: ../src/jarabe/desktop/keydialog.py:229
++msgid "WPA & WPA2 Personal"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:117
+-msgid "Software Update"
++#: ../src/jarabe/desktop/keydialog.py:238
++msgid "Wireless Security:"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:118
+-msgid "Update your activities to ensure compatibility with your new software"
++#. 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/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+-msgid "Cancel"
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
++msgid "Join"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+-msgid "Later"
++#: ../src/jarabe/desktop/networkviews.py:500
++#, python-format
++msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:127
+-msgid "Check now"
++#: ../src/jarabe/desktop/networkviews.py:634
++#, python-format
++msgid "Mesh Network %d"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:261
+-msgid "List view"
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid "Cannot connect to the server."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:262
+-msgid "<Ctrl>2"
++#: ../src/jarabe/desktop/schoolserver.py:150
++msgid "The server could not complete the request."
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:320
+-msgid "Favorites view"
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
++msgid "Decline"
+ msgstr ""
+ 
+-#: ../src/view/home/HomeBox.py:321
+-msgid "<Ctrl>1"
++#: ../src/jarabe/frame/activitiestray.py:523
++#, python-format
++msgid "%dB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:97
+-msgid "Connect"
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:106
+-msgid "Disconnect"
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:118
+-msgid "Disconnecting..."
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:159
+-msgid "Connecting..."
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
+ msgstr ""
+ 
+-#. TODO: show the channel number
+-#: ../src/view/home/MeshBox.py:166
+-msgid "Connected"
++#: ../src/jarabe/frame/activitiestray.py:569
++msgid "Accept"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
++#, python-format
++msgid "%s (%s)"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
+-#: ../src/view/devices/network/mesh.py:89
+-msgid "Disconnect..."
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
+ 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"
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
+ msgstr ""
+ 
+-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
+-msgid "Join"
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:45
+-msgid "My Battery"
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:114
+-msgid "Charging"
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
++msgid "Open"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:117
+-msgid "Very little power remaining"
++#: ../src/jarabe/frame/clipboardmenu.py:90
++msgid "Open with"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:123
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+-msgid "%(hour)d:%(min).2d remaining"
++msgid "%s clipping"
+ msgstr ""
+ 
+-#: ../src/view/devices/battery.py:127
+-msgid "Charged"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "Neighborhood"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:44
+-msgid "My Speakers"
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:125
+-msgid "Unmute"
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
+ msgstr ""
+ 
+-#: ../src/view/devices/speaker.py:128
+-msgid "Mute"
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:67
+-msgid "Disconnected"
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
+ msgstr ""
+ 
+-#: ../src/view/devices/network/wireless.py:143
+-msgid "Channel"
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:37
+-msgid "Neighborhood"
++#: ../src/jarabe/intro/window.py:126
++msgid "Click to change color:"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:39
+-msgid "Group"
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
++msgid "Back"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:41
+-msgid "Home"
++#: ../src/jarabe/intro/window.py:204
++msgid "Next"
+ msgstr ""
+ 
+-#: ../src/view/frame/zoomtoolbar.py:43
+-msgid "Activity"
++#: ../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/cmd.py:26
+-#, python-format
+-msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++#: ../src/jarabe/journal/expandedentry.py:245
++msgid "No preview"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:28
++#: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
++msgid "Kind: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:29
+-#, python-format
+-msgid "sugar-control-panel: %s"
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
+ 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
+-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"
+-"    "
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++msgid "Date: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/cmd.py:48
+-msgid "To apply your changes you have to restart sugar.\n"
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++msgid "Size: %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+-msgid "Ok"
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
+ msgstr ""
+ 
+-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
+-msgid "Changes require restart"
++#: ../src/jarabe/journal/expandedentry.py:301
++msgid "Participants:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:264
+-msgid "Warning"
++#: ../src/jarabe/journal/expandedentry.py:323
++msgid "Description:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:268
+-msgid "Cancel changes"
++#: ../src/jarabe/journal/expandedentry.py:348
++msgid "Tags:"
+ msgstr ""
+ 
+-#: ../src/controlpanel/gui.py:277
+-msgid "Restart now"
++#: ../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/aboutme/model.py:44
+-msgid "You must enter a name."
++#: ../src/jarabe/journal/journaltoolbox.py:71
++msgid "Search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:69
+-#, python-format
+-msgid "stroke:   color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:138
++msgid "Anytime"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:72
+-#, python-format
+-msgid "stroke:   %s"
++#: ../src/jarabe/journal/journaltoolbox.py:140
++msgid "Today"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:74
+-#, python-format
+-msgid "fill:     color=%s hue=%s"
++#: ../src/jarabe/journal/journaltoolbox.py:142
++msgid "Since yesterday"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:76
+-#, python-format
+-msgid "fill:     %s"
++#. TRANS: Filter entries modified during the last 7 days.
++#: ../src/jarabe/journal/journaltoolbox.py:144
++msgid "Past week"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:87
+-msgid "Error in specified color modifiers."
++#. TRANS: Filter entries modified during the last 30 days.
++#: ../src/jarabe/journal/journaltoolbox.py:146
++msgid "Past month"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/model.py:90
+-msgid "Error in specified colors."
++#. TRANS: Filter entries modified during the last 356 days.
++#: ../src/jarabe/journal/journaltoolbox.py:148
++msgid "Past year"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:32
+-#: ../src/controlpanel/aboutme/__init__.py:22
+-msgid "About Me"
++#: ../src/jarabe/journal/journaltoolbox.py:155
++msgid "Anyone"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutme/view.py:134
+-msgid "Click to change your color:"
++#: ../src/jarabe/journal/journaltoolbox.py:157
++msgid "My friends"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/model.py:24
+-msgid "Not available"
++#: ../src/jarabe/journal/journaltoolbox.py:158
++msgid "My class"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:55
+-msgid "Identity"
++#: ../src/jarabe/journal/journaltoolbox.py:300
++msgid "Anything"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:64
+-msgid "Serial Number:"
++#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:87
+-msgid "Software"
++#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:96
+-msgid "Build:"
++#: ../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/aboutxo/view.py:111
+-msgid "Sugar:"
++#: ../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/aboutxo/view.py:126
+-msgid "Firmware:"
++#. TRANS: Action label for starting an entry.
++#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/palettes.py:74
++msgid "Start"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:148
+-msgid "Copyright and License"
++#: ../src/jarabe/journal/journaltoolbox.py:525
++msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:156
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#: ../src/jarabe/journal/journaltoolbox.py:526
++msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../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."
++#: ../src/jarabe/journal/journaltoolbox.py:527
++msgid "Sort by size"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/view.py:175
+-msgid "Full license:"
++#: ../src/jarabe/journal/journaltoolbox.py:536
++msgid "Sort view"
+ msgstr ""
+ 
+-#: ../src/controlpanel/aboutxo/__init__.py:21
+-msgid "About my XO"
++#: ../src/jarabe/journal/listview.py:316
++msgid "Your Journal is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/model.py:89
+-msgid "Error timezone does not exist."
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/view.py:68
+-msgid "Timezone"
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
+ msgstr ""
+ 
+-#: ../src/controlpanel/datetime/__init__.py:21
+-msgid "Date & Time"
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+-msgid "Value must be an integer."
++#: ../src/jarabe/journal/listview.py:397
++msgid "Clear search"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:26
+-msgid "never"
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:27
+-msgid "instantaneous"
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:28
+-#, python-format
+-msgid "%s seconds"
++#: ../src/jarabe/journal/modalalert.py:64
++msgid "Your Journal is full"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:52
+-msgid "Activation Delay"
++#: ../src/jarabe/journal/modalalert.py:68
++msgid "Please delete some old Journal entries to make space for new ones."
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:76
+-msgid "Corner"
++#: ../src/jarabe/journal/modalalert.py:80
++msgid "Show Journal"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/view.py:111
+-msgid "Edge"
++#: ../src/jarabe/journal/objectchooser.py:146
++msgid "Choose an object"
+ msgstr ""
+ 
+-#: ../src/controlpanel/frame/__init__.py:21
+-msgid "Frame"
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:28
+-msgid "Could not access ~/.i18n. Create standard settings."
++#: ../src/jarabe/journal/palettes.py:72
++msgid "Resume with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:114
+-#, python-format
+-msgid "Language for code=%s could not be determined."
++#: ../src/jarabe/journal/palettes.py:75
++msgid "Start with"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/model.py:131
+-#, python-format
+-msgid "Sorry I do not speak '%s'."
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/language/view.py:70
+-#: ../src/controlpanel/language/__init__.py:21
+-msgid "Language"
++#: ../src/jarabe/journal/palettes.py:112
++msgid "Send to"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:62
+-msgid "State is unknown."
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/model.py:82
+-msgid "Error in specified radio argument use on/off."
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:28
+-#: ../src/controlpanel/network/__init__.py:21
+-msgid "Network"
++#: ../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/controlpanel/network/view.py:54
+-msgid "Wireless"
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:62
+-msgid "Turn of the wireless radio to save battery life"
++#: ../src/jarabe/journal/palettes.py:322
++msgid "No friends present"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:75
+-msgid "Radio"
++#: ../src/jarabe/journal/palettes.py:327
++msgid "No valid connection found"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:91
+-msgid "Discard network history if you have trouble connecting to the network"
++#: ../src/jarabe/journal/palettes.py:355
++msgid "No activity to resume entry"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:100
+-msgid "Discard network history"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
+ msgstr ""
+ 
+-#: ../src/controlpanel/network/view.py:113
+-msgid "Mesh"
++#: ../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/controlpanel/network/view.py:122
+-msgid "Server:"
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:55
+-msgid "Error in automatic pm argument, use on/off."
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/model.py:84
+-msgid "Error in extreme pm argument, use on/off."
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:47
+-msgid "Power management"
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:57
+-msgid "Automatic power management (increases battery life)"
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/view.py:85
++#: ../src/jarabe/model/network.py:173
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
+ 
+-#: ../src/controlpanel/power/__init__.py:21
+-msgid "Power"
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:111
+-msgid "Connected to a School Mesh Portal"
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:113
+-msgid "Looking for a School Mesh Portal..."
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:116
+-msgid "Connected to an XO Mesh Portal"
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:118
+-msgid "Looking for an XO Mesh Portal..."
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:121
+-msgid "Connected to a Simple Mesh"
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:123
+-msgid "Starting a Simple Mesh"
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#: ../src/view/devices/network/mesh.py:130
+-msgid "Unknown Mesh"
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/frame/activitiestray.py:211
+-msgid "Decline"
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the freeform layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:107
+-msgid "Freeform"
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
+ msgstr ""
+ 
+-#. TRANS: label for the ring layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:189
+-msgid "Ring"
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
+ msgstr ""
+ 
+-#. TRANS: label for the spiral layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:334
+-msgid "Spiral"
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:401
+-msgid "Box"
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
+ msgstr ""
+ 
+-#. TRANS: label for the box layout in the favorites view
+-#: ../src/view/home/favoriteslayout.py:442
+-msgid "Triangle"
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:295
+-msgid "Registration Failed"
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:296
+-#, python-format
+-msgid "%s"
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:298
+-msgid "Registration Successful"
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:299
+-msgid "You are now registered with your school server."
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:420
+-msgid "Settings"
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:425
+-msgid "Restart"
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:430
+-msgid "Shutdown"
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
+ msgstr ""
+ 
+-#: ../src/view/home/favoritesview.py:436
+-msgid "Register"
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:42
+-msgid "Starting..."
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:72
+-msgid "Stop"
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
+ 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/model/network.py:226
++msgid "Not searching for networks."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:138
+-msgid "Remove favorite"
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:142
+-msgid "Make favorite"
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:191
+-msgid "Show contents"
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
+ msgstr ""
+ 
+-#: ../src/view/palettes.py:215
+-#, python-format
+-msgid "%(free_space)d MB Free"
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:62
+-msgid "Search"
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:119
+-msgid "Anytime"
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:121
+-msgid "Today"
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:123
+-msgid "Since yesterday"
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/journal/journaltoolbox.py:125
+-msgid "Past week"
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/journal/journaltoolbox.py:127
+-msgid "Past month"
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
+ msgstr ""
+ 
+-#. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/journal/journaltoolbox.py:129
+-msgid "Past year"
++#: ../src/jarabe/view/buddymenu.py:67
++msgid "Remove friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:136
+-msgid "Anyone"
++#: ../src/jarabe/view/buddymenu.py:70
++msgid "Make friend"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:138
+-msgid "My friends"
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
+ msgstr ""
+ 
+-#: ../src/journal/journaltoolbox.py:139
+-msgid "My class"
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
+ msgstr ""
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/journal/journaltoolbox.py:255
+-msgid "Anything"
++#: ../src/jarabe/view/buddymenu.py:101
++msgid "Logout"
+ msgstr ""
+ 
+-#. TODO: Add "Start with" menu item
+-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+-msgid "Copy"
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
+ msgstr ""
+ 
+-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+-#: ../src/journal/palettes.py:51
+-msgid "Untitled"
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
+ msgstr ""
+ 
+-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+-msgid "Journal"
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:222
+-msgid "No preview"
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:241
+-msgid "Participants:"
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:266
+-msgid "Description:"
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
+ msgstr ""
+ 
+-#: ../src/journal/expandedentry.py:292
+-msgid "Tags:"
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:134
+-msgid "Choose an object"
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
+ msgstr ""
+ 
+-#: ../src/journal/objectchooser.py:139
+-msgid "Close"
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
+ msgstr ""
+ 
+-#: ../src/journal/volumestoolbar.py:93
+-msgid "Unmount"
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
+ msgstr ""
+ 
+-#: ../src/journal/misc.py:95
+-msgid "No date"
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:39
+-msgid "Your Journal is empty"
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
+ msgstr ""
+ 
+-#: ../src/journal/listview.py:40
+-msgid "No matching entries "
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:59
+-msgid "Your Journal is full"
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:63
+-msgid "Please delete some old Journal entries to make space for new ones."
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++msgid "View source: %r"
+ msgstr ""
+ 
+-#: ../src/journal/modalalert.py:75
+-msgid "Show Journal"
++#: ../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 ""
++
++#: ../extensions/cpsection/aboutme/model.py:80
++#, python-format
++msgid "fill:     color=%s hue=%s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:23
+-msgid "Forward"
+-msgstr "Lọ síwájú"
++#: ../extensions/cpsection/aboutme/model.py:82
++#, python-format
++msgid "fill:     %s"
++msgstr ""
+ 
+-#: ../activities/browser/NavigationToolbar.py:29
+-msgid "Reload"
+-msgstr "Tun kì"
++#: ../extensions/cpsection/aboutme/model.py:94
++msgid "Error in specified color modifiers."
++msgstr ""
+ 
+-#: ../shell/shell.py:333
+-msgid "Everyone"
+-msgstr "Gbogbo èèyàn"
++#: ../extensions/cpsection/aboutme/model.py:97
++msgid "Error in specified colors."
++msgstr ""
+ 
+-#: ../sugar/chat/ChatEditor.py:43
+-msgid "Send"
+-msgstr "Fi ránṣẹ́"
++#: ../extensions/cpsection/aboutme/view.py:235
++msgid "Click to change your color:"
++msgstr ""
+ 
+-#: ../shell/intro/intro.py:67
+-msgid "Name:"
++#: ../extensions/cpsection/aboutcomputer/__init__.py:21
++msgid "About my Computer"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:96
+-msgid "Click to change color:"
++#: ../extensions/cpsection/aboutcomputer/model.py:42
++msgid "Not available"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:160
+-msgid "Done"
++#: ../extensions/cpsection/aboutcomputer/model.py:171
++#, python-format
++msgid "%(interface)s: %(version)s"
+ msgstr ""
+ 
+-#: ../shell/intro/intro.py:163
+-msgid "Next"
++#: ../extensions/cpsection/aboutcomputer/view.py:61
++msgid "Identity"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:59
+-msgid "Remove friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:70
++msgid "Serial Number:"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:62
+-msgid "Make friend"
++#: ../extensions/cpsection/aboutcomputer/view.py:92
++msgid "Software"
+ msgstr ""
+ 
+-#: ../shell/view/BuddyMenu.py:84
+-#, python-format
+-msgid "Invite to %s"
++#: ../extensions/cpsection/aboutcomputer/view.py:101
++msgid "Build:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:58
+-msgid "Remove"
++#: ../extensions/cpsection/aboutcomputer/view.py:116
++msgid "Sugar:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:63
+-msgid "Open"
++#: ../extensions/cpsection/aboutcomputer/view.py:132
++msgid "Firmware:"
+ 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:147
++msgid "Wireless Firmware:"
+ msgstr ""
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../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 ""
+ 
+-#: ../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 ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
++#: ../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/frame/zoomtoolbar.py:54
+-msgid "Group"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
+ msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
++#: ../extensions/cpsection/network/model.py:140
++msgid "Error in specified argument use 0/1."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
+ msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
++#: ../extensions/cpsection/updater/view.py:63
++msgid ""
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
++msgid "Checking %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
++msgid "Downloading %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
++msgid "Updating %s..."
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
+-#, python-format
+-msgid "%d months"
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+-msgid "%d week"
++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/objectchooser.py:177
+-#, python-format
+-msgid "%d weeks"
++#: ../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 day"
++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:178
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d days"
++msgid "Download size: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d hour"
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
+-#, python-format
+-msgid "%d hours"
++#. 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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d minute"
++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"
++msgid "%.1f MB"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:71
++msgid "My Battery"
++msgstr ""
++
++#: ../extensions/deviceicon/battery.py:147
++msgid "Removed"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../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 "%d second"
++msgid "%(hour)d:%(min).2d remaining"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr ""
++
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+-msgid "%d seconds"
++msgid "IP address: %s"
+ msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
++#: ../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 ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
++#: ../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/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\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 ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
++#: ../extensions/deviceicon/network.py:144
++msgid "Channel"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
++#: ../extensions/deviceicon/network.py:159
++msgid "Wired Network"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
++#: ../extensions/deviceicon/network.py:188
++msgid "Speed"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
++#: ../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 ""
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
++#: ../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/controlpanel/control.py:366
+-msgid "Error in reading timezone"
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:397
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "Error copying timezone (from %s): %s"
++msgid "Error: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:402
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "Changing permission of timezone: %s"
++msgid "Suggestion: %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "Could not access %s. Create standard settings."
++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 ""
+ 
+-#: ../shell/controlpanel/control.py:463
++#: ../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 "Language for code=%s could not be determined."
++msgid "Mesh Network %s"
+ msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../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 "Sorry I do not speak '%s'."
++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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
+ msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:9
++msgid "Default nick"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "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 "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 "Wádìí"
++
++#: ../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 ""
++
++#~ 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 "点击改变颜色:"
+ 
+-#: ../shell/view/BuddyMenu.py:84
++#: ../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"
+-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 "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 "错误, 时区资料不存在."
+ 
+-#. 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/datetime/view.py:70 ../data/sugar.schemas.in.h:52
++msgid "Timezone"
++msgstr "时区"
+ 
+-#: ../shell/view/clipboardmenu.py:213
++#: ../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 "Clipboard object: %s."
+-msgstr "剪贴板物件: %s."
++msgid "%s seconds"
++msgstr "%s 秒"
+ 
+-#: ../shell/hardware/keydialog.py:149
+-msgid "Key Type:"
+-msgstr "密钥类型:"
++#: ../extensions/cpsection/frame/view.py:54
++msgid "Activation Delay"
++msgstr "延期激活"
+ 
+-#: ../shell/hardware/keydialog.py:169
+-msgid "Authentication Type:"
+-msgstr "验证类型:"
++#: ../extensions/cpsection/frame/view.py:78
++msgid "Corner"
++msgstr "角落"
+ 
+-#: ../shell/hardware/keydialog.py:250
+-msgid "Encryption Type:"
+-msgstr "加密类型:"
++#: ../extensions/cpsection/frame/view.py:113
++msgid "Edge"
++msgstr "边缘"
+ 
+-#: ../shell/view/home/activitiesdonut.py:90
+-msgid "Starting..."
+-msgstr "开始..."
++#: ../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"
+-msgstr "继续"
++#: ../extensions/cpsection/keyboard/view.py:190
++msgid "Keyboard Model"
++msgstr "键盘型号"
+ 
+-#: ../shell/view/home/activitiesdonut.py:111
+-#: ../lib/sugar/activity/activity.py:132
+-msgid "Stop"
+-msgstr "停止"
++#: ../extensions/cpsection/keyboard/view.py:250
++msgid "Key(s) to change layout"
++msgstr ""
+ 
+-#: ../shell/view/Shell.py:285
+-msgid "Screenshot"
+-msgstr "屏幕抓图"
++#: ../extensions/cpsection/keyboard/view.py:319
++msgid "Keyboard Layout(s)"
++msgstr "键盘布局"
+ 
+-#: ../shell/view/home/HomeBox.py:159
+-msgid "Reboot"
+-msgstr "重新启动"
++#: ../extensions/cpsection/language/__init__.py:21
++#: ../extensions/cpsection/language/view.py:33
++msgid "Language"
++msgstr "语言"
+ 
+-#: ../shell/view/home/HomeBox.py:164
+-msgid "Shutdown"
+-msgstr "关闭系统"
++#: ../extensions/cpsection/language/model.py:30
++msgid "Could not access ~/.i18n. Create standard settings."
++msgstr "无法读取~/.i18n. 创建标准设置."
+ 
+-#: ../shell/view/home/HomeBox.py:170
+-msgid "Register"
+-msgstr "注册"
++#: ../extensions/cpsection/language/model.py:129
++#, python-format
++msgid "Language for code=%s could not be determined."
++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
+-msgid "Mesh Network"
+-msgstr "网状网络"
++#: ../extensions/cpsection/language/model.py:152
++#, python-format
++msgid "Sorry I do not speak '%s'."
++msgstr "对不起，我不会说 '%s'"
+ 
+-#: ../shell/view/home/MeshBox.py:300
+-msgid "Join"
+-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/view/devices/battery.py:38
+-msgid "My Battery life"
+-msgstr "我的电池状态"
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
++msgstr "数据机设定"
+ 
+-#: ../shell/view/devices/battery.py:94
+-msgid "Battery charging"
+-msgstr "电池充电中"
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
++msgstr ""
+ 
+-#: ../shell/view/devices/battery.py:96
+-msgid "Battery discharging"
+-msgstr "电池放电中"
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
++msgstr "密码∶"
+ 
+-#: ../shell/view/devices/battery.py:98
+-msgid "Battery fully charged"
+-msgstr "电池充电完成"
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:61
+-msgid "Disconnected"
+-msgstr "已切断"
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/wireless.py:131
+-msgid "Channel"
+-msgstr "频道"
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:42
+-msgid "Neighborhood"
+-msgstr "邻居"
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
++msgstr ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:54
+-msgid "Group"
+-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 ""
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:66
+-msgid "Home"
+-msgstr "家"
++#: ../extensions/cpsection/network/__init__.py:21
++#: ../extensions/cpsection/network/view.py:29
++msgid "Network"
++msgstr "网络"
+ 
+-#: ../shell/view/frame/zoomtoolbar.py:78
+-msgid "Activity"
+-msgstr "活动"
++#: ../extensions/cpsection/network/model.py:71
++msgid "State is unknown."
++msgstr "未知状态"
+ 
+-#: ../lib/sugar/activity/activity.py:115
+-msgid "Share with:"
+-msgstr "共享:"
++#: ../extensions/cpsection/network/model.py:99
++msgid "Error in specified radio argument use on/off."
++msgstr "给定无线信号开/关时发生错误"
+ 
+-#: ../lib/sugar/activity/activity.py:117
+-msgid "Private"
+-msgstr "私人"
++#: ../extensions/cpsection/network/model.py:140
++#, fuzzy
++msgid "Error in specified argument use 0/1."
++msgstr "给定无线信号开/关时发生错误"
+ 
+-#: ../lib/sugar/activity/activity.py:118
+-msgid "My Neighborhood"
+-msgstr "我的邻居"
++#: ../extensions/cpsection/network/view.py:61
++msgid "Wireless"
++msgstr "无线"
+ 
+-#: ../lib/sugar/activity/activity.py:126
+-msgid "Keep"
+-msgstr "保持"
++#: ../extensions/cpsection/network/view.py:69
++msgid "Turn off the wireless radio to save battery life"
++msgstr "请关闭无线网络信号来增加电池使用时间"
+ 
+-#: ../lib/sugar/activity/activity.py:245
+-msgid "Undo"
+-msgstr "撤销"
++#: ../extensions/cpsection/network/view.py:82
++msgid "Radio"
++msgstr "无线信号"
+ 
+-#: ../lib/sugar/activity/activity.py:250
+-msgid "Redo"
+-msgstr "重复"
++#: ../extensions/cpsection/network/view.py:98
++msgid "Discard network history if you have trouble connecting to the network"
++msgstr "如果你连接不上网络，请尝试删除网络历史资料"
+ 
+-#: ../lib/sugar/activity/activity.py:260
+-msgid "Copy"
+-msgstr "复制"
++#: ../extensions/cpsection/network/view.py:107
++msgid "Discard network history"
++msgstr "删除网络历史资料"
+ 
+-#: ../lib/sugar/activity/activity.py:265
+-msgid "Paste"
+-msgstr "粘贴"
++#: ../extensions/cpsection/network/view.py:122
++msgid "Collaboration"
++msgstr ""
+ 
+-#: ../lib/sugar/activity/activity.py:454
+-#, python-format
+-msgid "%s Activity"
+-msgstr "%s 的活动"
++#: ../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 ""
+ 
+-#: ../lib/sugar/activity/activity.py:824
+-msgid "Keep error"
+-msgstr "保持错误"
++#: ../extensions/cpsection/network/view.py:140
++msgid "Server:"
++msgstr "服务器："
+ 
+-#: ../lib/sugar/activity/activity.py:825
+-msgid "Keep error: all changes will be lost"
+-msgstr "保持错误:所有改动都将撤销"
++#: ../extensions/cpsection/power/__init__.py:21
++msgid "Power"
++msgstr "电源"
+ 
+-#: ../lib/sugar/activity/activity.py:828
+-msgid "Don't stop"
+-msgstr "不停止"
++#: ../extensions/cpsection/power/model.py:90
++msgid "Error in automatic pm argument, use on/off."
++msgstr "自动省电管理开关发生错误"
+ 
+-#: ../lib/sugar/activity/activity.py:831
+-msgid "Stop anyway"
+-msgstr "停止吧"
++#: ../extensions/cpsection/power/model.py:120
++msgid "Error in extreme pm argument, use on/off."
++msgstr "极度省电管理开关发生错误"
+ 
+-#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+-msgid "Cancel"
+-msgstr "取消"
++#: ../extensions/cpsection/power/view.py:48
++msgid "Power management"
++msgstr "省电管理"
+ 
+-#: ../lib/sugar/graphics/alert.py:168
+-msgid "Ok"
+-msgstr "确定"
++#: ../extensions/cpsection/power/view.py:58
++msgid "Automatic power management (increases battery life)"
++msgstr "自动省电管理(延长电池寿命)"
+ 
+-#: ../lib/sugar/graphics/alert.py:216
+-msgid "Continue"
+-msgstr "继续"
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
++msgstr "极低电源管理（关闭无线，增加电池使用时间）"
+ 
+-#: ../lib/sugar/graphics/alert.py:244
+-msgid "OK"
+-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/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "%d year"
+-msgstr "%d 年"
++msgid "Checking %s..."
++msgstr "正在检查 %s…"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:175
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+-msgid "%d years"
+-msgstr "%d 年"
++msgid "Downloading %s..."
++msgstr "正在下载 %s…"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+-msgid "%d month"
+-msgstr "%d 月"
++msgid "Updating %s..."
++msgstr "正在更新 %s…"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:176
++#: ../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 "%d months"
+-msgstr "%d 月"
++msgid "%s update was installed"
++msgid_plural "%s updates were installed"
++msgstr[0] "已安装 %s个更新"
++
++#: ../extensions/cpsection/updater/view.py:255
++msgid "Install selected"
++msgstr "安装已选择的更新"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+-msgid "%d week"
+-msgstr "%d 星期"
++msgid "Download size: %s"
++msgstr "下载大小：%s"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:177
++#: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+-msgid "%d weeks"
+-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 "完成"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr "1千字节"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+-msgid "%d day"
+-msgstr "%d 天"
++msgid "%.0f KB"
++msgstr "%.0f 千字节"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:178
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
+ #, python-format
+-msgid "%d days"
+-msgstr "%d 天"
++msgid "%.1f MB"
++msgstr "%.1f 兆字节"
++
++#: ../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:179
++#: ../extensions/deviceicon/battery.py:153
++msgid "Very little power remaining"
++msgstr "只剩下很少电力"
++
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+-msgid "%d hour"
+-msgstr "%d 小时"
++msgid "%(hour)d:%(min).2d remaining"
++msgstr "剩下 %(hour)d:%(min).2d"
++
++#: ../extensions/deviceicon/battery.py:161
++msgid "Charged"
++msgstr "充电完成"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:179
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+-msgid "%d hours"
+-msgstr "%d 小时"
++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 "频道"
++
++#: ../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 "请再尝试连线"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/deviceicon/network.py:336
+ #, python-format
+-msgid "%d minute"
+-msgstr "%d 分钟"
++msgid "Error: %s"
++msgstr "错误：%s"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:180
++#: ../extensions/deviceicon/network.py:340
+ #, python-format
+-msgid "%d minutes"
+-msgstr "%d 分钟"
++msgid "Suggestion: %s"
++msgstr "建议：%s"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/network.py:349
+ #, python-format
+-msgid "%d second"
+-msgstr "%d 秒"
++msgid "Connected for %s"
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:181
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
+ #, python-format
+-msgid "%d seconds"
+-msgstr "%d 秒"
++msgid "%d KB"
++msgstr "%d 千字节"
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:191
+-msgid " and "
+-msgstr "和"
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr ""
+ 
+-#: ../lib/sugar/graphics/objectchooser.py:193
+-msgid ", "
+-msgstr ","
++#: ../extensions/deviceicon/network.py:364
++msgid "Check your Access Point Name (APN) configuration"
++msgstr ""
+ 
+-# 如何翻译sugar?
+-#: ../shell/controlpanel/control.py:213
+-msgid "To apply your changes you have to restart sugar.\n"
+-msgstr "你需要重新启动系统, 让改变生效.\n"
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:267
+-msgid "Error in specified color modifiers."
+-msgstr "给定变化色时发生错误"
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:270
+-msgid "Error in specified colors."
+-msgstr "给定颜色时发生错误"
++#: ../extensions/deviceicon/network.py:612
++msgid "Mesh Network"
++msgstr "网状网络"
+ 
+-#: ../shell/controlpanel/control.py:307
+-msgid "off"
+-msgstr "关闭"
++#: ../extensions/deviceicon/network.py:656
++#, python-format, fuzzy
++msgid "Mesh Network %s"
++msgstr "网状网络 %s"
+ 
+-#: ../shell/controlpanel/control.py:309
+-msgid "on"
+-msgstr "开启"
++#: ../extensions/deviceicon/network.py:779
++msgid "No GSM connection available."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:310
+-msgid "State is unknown."
+-msgstr "未知状态"
++#: ../extensions/deviceicon/network.py:780
++msgid "Create a connection in the control panel."
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:332
+-msgid "Error in specified radio argument use on/off."
+-msgstr "给定无线信号开/关时发生错误"
++#: ../extensions/deviceicon/speaker.py:61
++msgid "My Speakers"
++msgstr "我的扬声器"
+ 
+-#: ../shell/controlpanel/control.py:336
+-msgid "Permission denied. You need to be root to run this method."
+-msgstr "权限不足. 你需要管理员权限来执行."
++#: ../extensions/deviceicon/speaker.py:138
++msgid "Unmute"
++msgstr "取消静音"
+ 
+-#: ../shell/controlpanel/control.py:366
+-msgid "Error in reading timezone"
+-msgstr "阅读时区资料时发生错误"
++#: ../extensions/deviceicon/speaker.py:141
++msgid "Mute"
++msgstr "无声"
+ 
+-#: ../shell/controlpanel/control.py:397
+-#, python-format
+-msgid "Error copying timezone (from %s): %s"
+-msgstr "从 %s 复制时区资料时发生错误: %s"
++#: ../extensions/deviceicon/touchpad.py:38
++msgid "finger"
++msgstr "手指"
+ 
+-#: ../shell/controlpanel/control.py:402
+-#, python-format
+-msgid "Changing permission of timezone: %s"
+-msgstr "改变时区设置的权限: %s"
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
++msgstr ""
+ 
+-#: ../shell/controlpanel/control.py:412
+-msgid "Error timezone does not exist."
+-msgstr "错误, 时区资料不存在."
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
++msgstr "我的触控板"
+ 
+-#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+-#, python-format
+-msgid "Could not access %s. Create standard settings."
+-msgstr "不能访问%s. 创建标准设置."
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
++msgstr "网状网络"
+ 
+-#: ../shell/controlpanel/control.py:463
+-#, python-format
+-msgid "Language for code=%s could not be determined."
+-msgstr "无法确定代码为 %s 的语言"
++#: ../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 "屏幕抓图"
+ 
+-#: ../shell/controlpanel/control.py:473
++#: ../extensions/globalkey/screenshot.py:74
+ #, python-format
+-msgid "Sorry I do not speak '%s'."
+-msgstr "对不起，我不会说 '%s'"
++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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:105
+-msgid "Connected to a School Mesh Portal"
+-msgstr "已连接到一个学校网状网络门户"
++#: ../data/sugar.schemas.in.h:2
++msgid "Additional directories which can contain updated translations."
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:107
+-msgid "Looking for a School Mesh Portal..."
+-msgstr "寻找学校网状网络门户中..."
++#: ../data/sugar.schemas.in.h:3
++msgid "Backup URL"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:110
+-msgid "Connected to an XO Mesh Portal"
+-msgstr "已连接到一个XO网状网络门户"
++#: ../data/sugar.schemas.in.h:4
++msgid "Bundle IDs of protected activities"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:112
+-msgid "Looking for an XO Mesh Portal..."
+-msgstr "寻找XO网状网络门户中..."
++#: ../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 ""
+ 
+-#: ../shell/view/devices/network/mesh.py:115
+-msgid "Connected to a Simple Mesh"
+-msgstr "已连接到一个简单网状网络"
++#: ../data/sugar.schemas.in.h:6
++msgid "Corner Delay"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:117
+-msgid "Starting a Simple Mesh"
+-msgstr "创建一个简单网状网络"
++#: ../data/sugar.schemas.in.h:7
++msgid "Default font face"
++msgstr ""
+ 
+-#: ../shell/view/devices/network/mesh.py:124
+-msgid "Unknown Mesh"
+-msgstr "未知网状网络"
++#: ../data/sugar.schemas.in.h:8
++msgid "Default font size"
++msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+-msgid "About this XO"
++#: ../data/sugar.schemas.in.h:9
++msgid "Default nick"
+ msgstr ""
+ 
+-#: ../shell/view/home/HomeBox.py:222
+-msgid "Not available"
++#: ../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 "sugar控制面板: 警告，在%r模块中发现重复的选项名称: %s "
++
++#: ../src/jarabe/controlpanel/cmd.py:30
++#, python-format
++msgid "sugar-control-panel: key=%s not an available option"
++msgstr "sugar控制面板: 键值=%s是不可用的选项"
++
++#: ../src/jarabe/controlpanel/cmd.py:31
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr "sugar控制面板: %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 ""
++"用法: 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"
++"    "
++
++# 如何翻译sugar?
++#: ../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 ""
++
++#: ../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 "指定偏好"
++
++# 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 "%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 "继续"
++
++#: ../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 "网状网络 %d"
++
++#: ../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 "%d字节"
++
++#: ../src/jarabe/frame/activitiestray.py:525
++#, python-format
++msgid "%dKB"
++msgstr "%d千字节"
++
++#: ../src/jarabe/frame/activitiestray.py:527
++#, python-format
++msgid "%dMB"
++msgstr "%d兆字节"
++
++#: ../src/jarabe/frame/activitiestray.py:544
++#, python-format
++msgid "%s of %s"
++msgstr "%s 中的 %s"
++
++#: ../src/jarabe/frame/activitiestray.py:558
++#, python-format
++msgid "Transfer from %s"
++msgstr "传送自 %s"
++
++#: ../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 "%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 "对方已取消档案传输"
++
++#: ../src/jarabe/frame/activitiestray.py:691
++#, python-format
++msgid "Transfer to %s"
++msgstr "传送到 %s"
++
++#: ../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 "%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 "无标题"
++
++#: ../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.
++#. 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 ""
++
++#: ../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: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 "剩余%(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 ""
++
++#: ../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 "已连接到一个学校网状网络门户"
++
++#~ 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 "未知网状网络"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0003-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0003-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..e5345f5
--- /dev/null
+++ b/rpms/sugar/0003-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,1576 @@
+From 7ee2e2f837a4d8c5d2ddd2136c211bdb1dd78a2d Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Fri, 28 Oct 2011 09:16:06 +0200
+Subject: [PATCH sugar 03/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 227 of 379 messages translated (11
+ fuzzy).
+
+---
+ po/km.po |  605 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 329 insertions(+), 276 deletions(-)
+
+diff --git a/po/km.po b/po/km.po
+index 3079c2a..06d730f 100644
+--- a/po/km.po
++++ b/po/km.po
+@@ -1,28 +1,41 @@
+ # 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.
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
+ # Rit Lim <rit.lim@gmail.com>, 2008.
+-#, 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"
++"POT-Creation-Date: 2011-10-20 00:32-0400\n"
++"PO-Revision-Date: 2011-10-08 09:43+0200\n"
++"Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: km\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=1; plural=0;\n"
++"X-Generator: Pootle 2.0.5\n"
+ 
+ #: ../extensions/cpsection/aboutme/__init__.py:24
+ msgid "About Me"
+-msgstr ""
++msgstr "អំពី​ខ្ញុំ"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr ""
++msgstr "អ្នក​ត្រូវ​តែ​បញ្ចូល​ឈ្មោះ"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+@@ -53,70 +66,73 @@ msgid "Error in specified colors."
+ msgstr "ពណ៌​នេះ​មាន​បញ្ហា"
+ 
+ #: ../extensions/cpsection/aboutme/view.py:235
+-#, fuzzy
+ msgid "Click to change your color:"
+-msgstr "ដូរ​ព័ណ"
++msgstr "ចុច​ដើម្បី​ដូរ​ពិណ​របស់​អ្នក ៖"
+ 
+ #: ../extensions/cpsection/aboutcomputer/__init__.py:21
+ msgid "About my Computer"
+-msgstr ""
++msgstr "អំពី​កុំព្យូទ័រ​របស់ខ្ញុំ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/model.py:42
++#: ../extensions/cpsection/aboutcomputer/model.py:43
+ msgid "Not available"
+ msgstr "មិន​អាច​រក​បាន"
+ 
+-#: ../extensions/cpsection/aboutcomputer/model.py:171
++#: ../extensions/cpsection/aboutcomputer/model.py:183
+ #, python-format
+ msgid "%(interface)s: %(version)s"
+-msgstr ""
++msgstr "%(interface)s: %(version)s"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:61
++#: ../extensions/cpsection/aboutcomputer/view.py:59
+ msgid "Identity"
+-msgstr ""
++msgstr "អត្តសញ្ញាណ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:70
++#: ../extensions/cpsection/aboutcomputer/view.py:68
+ msgid "Serial Number:"
+-msgstr ""
++msgstr "លេខសំគាល់ ៖"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:92
++#: ../extensions/cpsection/aboutcomputer/view.py:90
+ msgid "Software"
+-msgstr ""
++msgstr "សូសវែ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:101
++#: ../extensions/cpsection/aboutcomputer/view.py:99
+ msgid "Build:"
+-msgstr ""
++msgstr "ដំឡើង ៖"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:116
++#: ../extensions/cpsection/aboutcomputer/view.py:114
+ msgid "Sugar:"
+-msgstr ""
++msgstr "ស្ករ ៖"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:132
++#: ../extensions/cpsection/aboutcomputer/view.py:129
+ msgid "Firmware:"
+-msgstr ""
++msgstr "ហ្វឹមវែ ៖"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:147
++#: ../extensions/cpsection/aboutcomputer/view.py:144
+ msgid "Wireless Firmware:"
+-msgstr ""
++msgstr "ហ្វឹមវែ ឥត​ខ្សែ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:170
++#: ../extensions/cpsection/aboutcomputer/view.py:167
+ msgid "Copyright and License"
+-msgstr ""
++msgstr "កម្មសិទ្ឋិ​បញ្ញា​និង​អាជ្ញាប័ណ្ណ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:188
++#: ../extensions/cpsection/aboutcomputer/view.py:185
+ 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)គឺ​ជា​សេរីភាព​សូសវែ​ (software) "
++"ទទួល​ខុស​ត្រូវ​ដោយ GNU ជា​អាជ្ញាប័ណ្ណ​សាធារណ​ទូទៅ "
++"ហើយ​ស្វាគមន៍​ទៅ​លើ​ការ​ប្តូរ ចំលង​ចែកចាយ ដែល​មាន​លក្ខណ​ដែល​បាន​ចែង​នៅ​ទី​នេះ"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:200
++#: ../extensions/cpsection/aboutcomputer/view.py:197
+ msgid "Full license:"
+-msgstr ""
++msgstr "អាជ្ញាប័ណ្ណ​ពេញលេញ ៖"
+ 
+ #: ../extensions/cpsection/datetime/__init__.py:21
+ msgid "Date & Time"
+-msgstr ""
++msgstr "ថ្ងៃនិងម៉ោង"
+ 
+ #: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+@@ -124,50 +140,50 @@ msgstr "មានបញ្ហា ។ ដំបន់​ម៉ោង​នេះ
+ 
+ #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+-msgstr ""
++msgstr "ម៉ោងប្រចំតំបន់"
+ 
+ #: ../extensions/cpsection/frame/__init__.py:21
+ msgid "Frame"
+-msgstr ""
++msgstr "សុំ"
+ 
+ #: ../extensions/cpsection/frame/model.py:41
+ #: ../extensions/cpsection/frame/model.py:66
+ msgid "Value must be an integer."
+-msgstr ""
++msgstr "តំលៃ​ត្រូវតែ​ជា​លេខ"
+ 
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr ""
++msgstr "មិនដែល"
+ 
+ #: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+-msgstr ""
++msgstr "ដែល​កើត​ឡើង​ភ្លាម​ៗ"
+ 
+ #: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+ msgid "%s seconds"
+-msgstr ""
++msgstr "%s វិនាទី"
+ 
+ #: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+-msgstr ""
++msgstr "ពន្យារការ​ធ្វើ​សកម្មភាព"
+ 
+ #: ../extensions/cpsection/frame/view.py:78
+ msgid "Corner"
+-msgstr ""
++msgstr "កាច់ជ្រុង"
+ 
+ #: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+-msgstr ""
++msgstr "ក្រប"
+ 
+ #: ../extensions/cpsection/keyboard/__init__.py:21
+ #: ../extensions/cpsection/keyboard/view.py:32
+ msgid "Keyboard"
+-msgstr ""
++msgstr "ក្តារ​ចុច​"
+ 
+ #: ../extensions/cpsection/keyboard/view.py:190
+ msgid "Keyboard Model"
+-msgstr ""
++msgstr "ម៉ូដែល​ក្ដារចុច"
+ 
+ #: ../extensions/cpsection/keyboard/view.py:250
+ msgid "Key(s) to change layout"
+@@ -175,17 +191,16 @@ msgstr ""
+ 
+ #: ../extensions/cpsection/keyboard/view.py:319
+ msgid "Keyboard Layout(s)"
+-msgstr ""
++msgstr "ប្លង់​ក្ដារ​ចុច"
+ 
+ #: ../extensions/cpsection/language/__init__.py:21
+ #: ../extensions/cpsection/language/view.py:33
+ msgid "Language"
+-msgstr ""
++msgstr "ភាសា"
+ 
+ #: ../extensions/cpsection/language/model.py:30
+-#, fuzzy
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "មិន​អាច​អាន %s បាន​ទេ ។ បង្កើតស្ដង់ដារ​​សំរាប់​ការ​រៀបចំ"
++msgstr "មិន​អាច​អាន ~/i១៨n បាន​ទេ ។ បង្កើត​និយាម​​​សម្រាប់​កំណត់"
+ 
+ #: ../extensions/cpsection/language/model.py:129
+ #, python-format
+@@ -205,19 +220,19 @@ msgstr ""
+ 
+ #: ../extensions/cpsection/modemconfiguration/__init__.py:21
+ msgid "Modem Configuration"
+-msgstr ""
++msgstr "ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ូដឹម"
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:94
+ msgid "Username:"
+-msgstr ""
++msgstr "ឈ្មោះអ្នក​ប្រើ ៖"
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:106
+ msgid "Password:"
+-msgstr ""
++msgstr "ពាក្យ​សម្ងាត់ ៖"
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:118
+ msgid "Number:"
+-msgstr ""
++msgstr "លេខ"
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:130
+ msgid "Access Point Name (APN):"
+@@ -240,7 +255,7 @@ msgstr ""
+ #: ../extensions/cpsection/network/__init__.py:21
+ #: ../extensions/cpsection/network/view.py:29
+ msgid "Network"
+-msgstr ""
++msgstr "បណ្ដាញ"
+ 
+ #: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+@@ -248,36 +263,36 @@ msgstr "ស្ថានភាព​មិន​ស្គាល់"
+ 
+ #: ../extensions/cpsection/network/model.py:99
+ msgid "Error in specified radio argument use on/off."
+-msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
++msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះដែលប្រើ បិទ​/បើក"
+ 
+ #: ../extensions/cpsection/network/model.py:140
+-#, fuzzy
+ msgid "Error in specified argument use 0/1."
+-msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះ"
++msgstr ""
++"​មាន​​បញ្ហា​នៅ​​ក្នុង​ការ​កំណត់​​នៃ​ភាព​មិន​ត្រូវ​គ្នា​ដល់​ការ​ប្រើ បិត/បើក"
+ 
+ #: ../extensions/cpsection/network/view.py:61
+ msgid "Wireless"
+-msgstr ""
++msgstr "ឥត​ខ្សែ"
+ 
+ #: ../extensions/cpsection/network/view.py:69
+ msgid "Turn off the wireless radio to save battery life"
+-msgstr ""
++msgstr "បិត​ប្រព័ន្ឋ​វិទ្យុឥត​​ខ្សែ​ដើម្បី​សន្សំ​ថ្ម"
+ 
+ #: ../extensions/cpsection/network/view.py:82
+ msgid "Radio"
+-msgstr ""
++msgstr "វិទ្យុ"
+ 
+ #: ../extensions/cpsection/network/view.py:98
+ msgid "Discard network history if you have trouble connecting to the network"
+-msgstr ""
++msgstr "ផ្តាច់​ប្រព័ន្ឋ​ជាមុន​ប្រសិន​បើ​មាន​បញ្ហា​ដល់​ភ្ជាប់​ប្រព័ន្ឋ​បណ្ដាញ"
+ 
+ #: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+-msgstr ""
++msgstr "ផ្តាច់​ប្រព័ន្ឋ​ជាមុន​ប្រសិន​"
+ 
+ #: ../extensions/cpsection/network/view.py:122
+ msgid "Collaboration"
+-msgstr ""
++msgstr "សហប្រតិបត្តិការ"
+ 
+ #: ../extensions/cpsection/network/view.py:130
+ msgid ""
+@@ -285,86 +300,96 @@ msgid ""
+ "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 ""
++msgstr "ម៉ាស៊ីន​មេ ៖"
+ 
+ #: ../extensions/cpsection/power/__init__.py:21
+ msgid "Power"
+-msgstr ""
++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 ""
++msgstr "ការគ្រប់គ្រងថាមពល"
+ 
+ #: ../extensions/cpsection/power/view.py:58
+ msgid "Automatic power management (increases battery life)"
+-msgstr ""
++msgstr "ការ​គ្រប់គ្រង​ថាមពល​ស្វ័យប្រវត្ត (ដើម្បី​ប្រើប្រាស់​ថ្ម​បាន​យូរ)"
+ 
+ #: ../extensions/cpsection/power/view.py:86
++#, fuzzy
+ msgid ""
+ "Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
++"ការគ្រប់គ្រង​ថាមពល​ឆ្លាស់ (ផ្ដាច់​ប្រព័ន្ធ​វិទ្យុ​ឥត​ខ្សែ "
++"ដើម្បី​​ប្រើប្រាស់​​ថ្ម​​បាន​​យូរ)"
+ 
+ #: ../extensions/cpsection/updater/__init__.py:21
+ msgid "Software update"
+-msgstr ""
++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
++#, python-format,
+ msgid "Checking %s..."
+-msgstr ""
++msgstr "កំពុង​ពិនិត្យ​មើល %s..."
+ 
+ #: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+ msgid "Downloading %s..."
+-msgstr ""
++msgstr "កំពុងទាញយក %s..."
+ 
+ #: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+ msgid "Updating %s..."
+-msgstr ""
++msgstr "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព %s..."
+ 
+ #: ../extensions/cpsection/updater/view.py:139
+ msgid "Your software is up-to-date"
+-msgstr ""
++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 ""
++msgstr "កំពុង​ពិនិត្យ​រក​មើលបច្ចុប្បន្នភាព..."
+ 
+ #: ../extensions/cpsection/updater/view.py:164
+ msgid "Installing updates..."
+-msgstr ""
++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"
+@@ -373,7 +398,7 @@ msgstr ""
+ #: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+ msgid "Download size: %s"
+-msgstr ""
++msgstr "ទំហំ​ទាញយក ៖ %s"
+ 
+ #: ../extensions/cpsection/updater/view.py:364
+ #, python-format
+@@ -382,63 +407,61 @@ msgstr ""
+ 
+ #. TRANS: download size is 0
+ #: ../extensions/cpsection/updater/view.py:382
+-#, fuzzy
+ msgid "None"
+-msgstr "រួច​ហើយ"
++msgstr "គ្មាន"
+ 
+ #. TRANS: download size of very small updates
+ #: ../extensions/cpsection/updater/view.py:385
+ msgid "1 KB"
+-msgstr ""
++msgstr "1 គីឡូបៃ"
+ 
+ #. TRANS: download size of small updates, e.g. '250 KB'
+ #: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+ msgid "%.0f KB"
+-msgstr ""
++msgstr "%.0f គីឡូបៃ"
+ 
+ #. TRANS: download size of updates, e.g. '2.3 MB'
+ #: ../extensions/cpsection/updater/view.py:391
+ #, python-format
+ msgid "%.1f MB"
+-msgstr ""
++msgstr "%.1f MB"
+ 
+ #: ../extensions/deviceicon/battery.py:71
+ msgid "My Battery"
+-msgstr ""
++msgstr "ថ្មរបស់ខ្ញុំ"
+ 
+ #: ../extensions/deviceicon/battery.py:147
+-#, fuzzy
+ msgid "Removed"
+ msgstr "យក​ចេញ"
+ 
+ #: ../extensions/deviceicon/battery.py:150
+ msgid "Charging"
+-msgstr ""
++msgstr "កំពុងបញ្ចូល"
+ 
+ #: ../extensions/deviceicon/battery.py:153
+ msgid "Very little power remaining"
+-msgstr ""
++msgstr "ថាមពលនៅសល់តិចតួចណាស់"
+ 
+ #: ../extensions/deviceicon/battery.py:158
+ #, python-format
++#, python-format, fuzzy
+ msgid "%(hour)d:%(min).2d remaining"
+-msgstr ""
++msgstr "%(ម៉ោង)d %(នាទី)២d នៅសល់"
+ 
+ #: ../extensions/deviceicon/battery.py:161
+ msgid "Charged"
+-msgstr ""
++msgstr "បានបញ្ចូល"
+ 
+ #: ../extensions/deviceicon/network.py:49
+ #, python-format
+ msgid "IP address: %s"
+-msgstr ""
++msgstr "អាសយដ្ឋាន​ភ្ជាប់​​អ៊ីនធឺណិត ៖ %s"
+ 
+ #: ../extensions/deviceicon/network.py:104
+ #: ../extensions/deviceicon/network.py:303
+ #: ../src/jarabe/desktop/networkviews.py:140
+-#: ../src/jarabe/desktop/networkviews.py:508
+-#, fuzzy
++#: ../src/jarabe/desktop/networkviews.py:509
+ msgid "Disconnect"
+ msgstr "ផ្ដាច់"
+ 
+@@ -448,20 +471,20 @@ msgstr "ផ្ដាច់"
+ # 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
+-#, fuzzy
++#: ../src/jarabe/desktop/networkviews.py:244
++#: ../src/jarabe/desktop/networkviews.py:548
++#: ../src/jarabe/desktop/networkviews.py:683
+ msgid "Connecting..."
+-msgstr "ផ្ដាច់បណ្ដាញ"
++msgstr "តភ្ជាប់..."
+ 
++# 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
++#: ../src/jarabe/desktop/networkviews.py:254
++#: ../src/jarabe/desktop/networkviews.py:554
++#: ../src/jarabe/desktop/networkviews.py:689
+ msgid "Connected"
+-msgstr ""
++msgstr "ត​ភ្ជាប់​ហើយ"
+ 
+ #: ../extensions/deviceicon/network.py:130
+ msgid "No wireless connection"
+@@ -473,11 +496,11 @@ msgstr "ប៉ុស្ដិ៍"
+ 
+ #: ../extensions/deviceicon/network.py:159
+ msgid "Wired Network"
+-msgstr ""
++msgstr "ខ្សែ​បណ្ដាញ"
+ 
+ #: ../extensions/deviceicon/network.py:188
+ msgid "Speed"
+-msgstr ""
++msgstr "ល្បឿន"
+ 
+ #: ../extensions/deviceicon/network.py:213
+ msgid "Wireless modem"
+@@ -485,18 +508,18 @@ msgstr ""
+ 
+ #: ../extensions/deviceicon/network.py:281
+ msgid "Please wait..."
+-msgstr ""
++msgstr "សូម​រង់ចាំ..."
+ 
+ #: ../extensions/deviceicon/network.py:286
+ #: ../src/jarabe/desktop/networkviews.py:136
+-#: ../src/jarabe/desktop/networkviews.py:504
+-#: ../src/jarabe/desktop/networkviews.py:637
++#: ../src/jarabe/desktop/networkviews.py:505
++#: ../src/jarabe/desktop/networkviews.py:639
+ msgid "Connect"
+-msgstr ""
++msgstr "ភ្ជាប់"
+ 
+ #: ../extensions/deviceicon/network.py:287
+ msgid "Disconnected"
+-msgstr "ផ្ដាច់"
++msgstr "ផ្ដាច់ចេញ"
+ 
+ #: ../extensions/deviceicon/network.py:294
+ #: ../src/jarabe/controlpanel/toolbar.py:119
+@@ -505,7 +528,7 @@ msgstr "ផ្ដាច់"
+ #: ../src/jarabe/frame/activitiestray.py:704
+ #: ../src/jarabe/frame/activitiestray.py:732
+ msgid "Cancel"
+-msgstr ""
++msgstr "បោះបង់"
+ 
+ #: ../extensions/deviceicon/network.py:333
+ msgid "Try connection again"
+@@ -514,12 +537,13 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:336
+ #, python-format
+ msgid "Error: %s"
+-msgstr ""
++msgstr "កំហុស ៖ %s"
+ 
+ #: ../extensions/deviceicon/network.py:340
+ #, python-format
++#, python-format,
+ msgid "Suggestion: %s"
+-msgstr ""
++msgstr "ការ​ផ្តល់​យោ​បល់ ៖ %s"
+ 
+ #: ../extensions/deviceicon/network.py:349
+ #, python-format
+@@ -530,7 +554,7 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:356
+ #, python-format
+ msgid "%d KB"
+-msgstr ""
++msgstr "%d គីឡូបៃ"
+ 
+ #: ../extensions/deviceicon/network.py:361
+ msgid "Check your Pin/Puk configuration."
+@@ -553,9 +577,9 @@ msgid "Mesh Network"
+ msgstr "បណ្ដាញត"
+ 
+ #: ../extensions/deviceicon/network.py:656
+-#, python-format, fuzzy
++#, python-format
+ msgid "Mesh Network %s"
+-msgstr "បណ្ដាញត"
++msgstr "បណ្ដាញត %s"
+ 
+ #: ../extensions/deviceicon/network.py:779
+ msgid "No GSM connection available."
+@@ -567,15 +591,15 @@ msgstr ""
+ 
+ #: ../extensions/deviceicon/speaker.py:61
+ msgid "My Speakers"
+-msgstr ""
++msgstr "ឧបលួរ​របស់​ខ្ញុំ"
+ 
+ #: ../extensions/deviceicon/speaker.py:138
+ msgid "Unmute"
+-msgstr ""
++msgstr "មិនស្ងាត់"
+ 
+ #: ../extensions/deviceicon/speaker.py:141
+ msgid "Mute"
+-msgstr ""
++msgstr "ស្ងាត់"
+ 
+ #: ../extensions/deviceicon/touchpad.py:38
+ msgid "finger"
+@@ -583,7 +607,7 @@ msgstr ""
+ 
+ #: ../extensions/deviceicon/touchpad.py:39
+ msgid "stylus"
+-msgstr ""
++msgstr "ដែក​ចារ"
+ 
+ #: ../extensions/deviceicon/touchpad.py:68
+ msgid "My touchpad"
+@@ -591,7 +615,7 @@ msgstr ""
+ 
+ #: ../extensions/globalkey/screenshot.py:59
+ msgid "Mesh"
+-msgstr ""
++msgstr "សំណាញ់"
+ 
+ #: ../extensions/globalkey/screenshot.py:61
+ #: ../src/jarabe/frame/zoomtoolbar.py:41
+@@ -629,22 +653,26 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:3
+ msgid "Backup URL"
+-msgstr ""
++msgstr "កន្លែង​ចំលង​ទុក"
+ 
+ #: ../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 rgb colors. "
+ "Example: #AC32FF,#9A5200"
+ msgstr ""
++"ពណ៌​រួប​តំណាង XO ដែល​ត្រូវ​បាន​ប្រើប្រាស់​លើ​ពាសពេញ​ផ្ទៃ​តុ "
++"ដែល​ជា​ការ​កំណត់​សំគាល់​រាង​និង​ផ្ទៃ​ពណ៌​ដើម្បី​កំណត់​ពណ៌ rgb ឧទាហរណ៍ "
++"#AC៣២FF,#៩A៥២០០"
+ 
+ #: ../data/sugar.schemas.in.h:6
+ msgid "Corner Delay"
+-msgstr ""
++msgstr "ពន្យារកាច់ជ្រុង"
+ 
+ #: ../data/sugar.schemas.in.h:7
+ msgid "Default font face"
+@@ -683,12 +711,14 @@ msgid "Favorites resume mode"
+ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:16
++#, fuzzy
+ msgid "Font face that is used throughout the desktop."
+-msgstr ""
++msgstr "ឈ្មោះ​អ្នក​ប្រើ​ដែល​ត្រូវ​បាន​ប្រើ​ពាស​ពេញ​លើ​ផ្ទៃ​តុ"
+ 
+ #: ../data/sugar.schemas.in.h:17
++#, fuzzy
+ msgid "Font size that is used throughout the desktop."
+-msgstr ""
++msgstr "ឈ្មោះ​អ្នក​ប្រើ​ដែល​ត្រូវ​បាន​ប្រើ​ពាស​ពេញ​លើ​ផ្ទៃ​តុ"
+ 
+ #: ../data/sugar.schemas.in.h:18
+ msgid "GSM network APN"
+@@ -761,15 +791,15 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:34
+ msgid "Jabber Server"
+-msgstr ""
++msgstr "ម៉ាស៊ីនបម្រើ Jabber"
+ 
+ #: ../data/sugar.schemas.in.h:35
+ msgid "Keyboard layouts"
+-msgstr ""
++msgstr "ប្លង់​ក្ដារ​ចុច ៖"
+ 
+ #: ../data/sugar.schemas.in.h:36
+ msgid "Keyboard model"
+-msgstr ""
++msgstr "ម៉ូដែល​ក្ដារចុច"
+ 
+ #: ../data/sugar.schemas.in.h:37
+ msgid "Keyboard options"
+@@ -790,19 +820,19 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:41
+ msgid "Power Automatic"
+-msgstr ""
++msgstr "ថាមពល​ស្វ័យប្រវត្ត"
+ 
+ #: ../data/sugar.schemas.in.h:42
+ msgid "Power Automatic."
+-msgstr ""
++msgstr "ថាមពល​ស្វ័យប្រវត្ត"
+ 
+ #: ../data/sugar.schemas.in.h:43
+ msgid "Power Extreme"
+-msgstr ""
++msgstr "ថាមពល​ឆ្លាស់"
+ 
+ #: ../data/sugar.schemas.in.h:44
+ msgid "Power Extreme."
+-msgstr ""
++msgstr "ថាមពល​ឆ្លាស់"
+ 
+ #: ../data/sugar.schemas.in.h:45
+ msgid "Publish to Gadget"
+@@ -810,7 +840,7 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:46
+ msgid "Setting for muting the sound device."
+-msgstr ""
++msgstr "កំណត់​មិន​ឲ្យ​ឧបករណ៍​សំឡេង​ឮ"
+ 
+ #: ../data/sugar.schemas.in.h:47
+ msgid "Show Log out"
+@@ -826,7 +856,7 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:50
+ msgid "Sound Muted"
+-msgstr ""
++msgstr "ត្រូវបានបិទសំឡេង"
+ 
+ #: ../data/sugar.schemas.in.h:51
+ msgid "The keyboard model to be used"
+@@ -834,7 +864,7 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:53
+ msgid "Timezone setting for the system."
+-msgstr ""
++msgstr "ម៉ោង​តំបន់​ត្រូវ​បាន​កំណត់​នៅ​ក្នុង​ប្រពន្ធ"
+ 
+ #: ../data/sugar.schemas.in.h:54
+ msgid "Url of the jabber server to use."
+@@ -842,19 +872,19 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:55
+ msgid "Url where the backup is saved to."
+-msgstr ""
++msgstr "អភ័យដ្ឋាន​ដែល​ជា​ទីកន្លែង​រក្សា​ឯកសារ​ទុក"
+ 
+ #: ../data/sugar.schemas.in.h:56
+ msgid "User Color"
+-msgstr ""
++msgstr "ពណ៌អ្នកប្រើ"
+ 
+ #: ../data/sugar.schemas.in.h:57
+ msgid "User Name"
+-msgstr ""
++msgstr "ឈ្មោះអ្នកប្រើ"
+ 
+ #: ../data/sugar.schemas.in.h:58
+ msgid "User name that is used throughout the desktop."
+-msgstr ""
++msgstr "ឈ្មោះ​អ្នក​ប្រើ​ដែល​ត្រូវ​បាន​ប្រើ​ពាស​ពេញ​លើ​ផ្ទៃ​តុ"
+ 
+ #: ../data/sugar.schemas.in.h:59
+ msgid ""
+@@ -863,11 +893,11 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:60
+ msgid "Volume Level"
+-msgstr ""
++msgstr "ទំហំកំរិត"
+ 
+ #: ../data/sugar.schemas.in.h:61
+ msgid "Volume level for the sound device."
+-msgstr ""
++msgstr "ទំហំ​កម្រិត​​សម្រាប់​ប្រើ​លើ​ឧបករណ៍​សំឡេង"
+ 
+ #: ../data/sugar.schemas.in.h:62
+ msgid ""
+@@ -895,7 +925,6 @@ 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"
+@@ -908,42 +937,34 @@ msgid ""
+ "    -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"
+-"\t"
+ 
+ #: ../src/jarabe/controlpanel/cmd.py:52
+ msgid "To apply your changes you have to restart sugar.\n"
+-msgstr ""
++msgstr "ដើម្បី​ទទួល​បាន​សំណើ​សុំ​អោយ​ប្តូរ​ត្រូវ​ចាប់​ផ្តើម​ស៊ូហ្គឺ​ឡើង​វិញ \n"
+ 
++# This is assuming the context is a warning message, like, "Warning: this operation will be permanent."
+ #: ../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 ""
++msgstr "ប្រយ័ត្ន"
+ 
+ #: ../src/jarabe/controlpanel/gui.py:297
+ #: ../src/jarabe/controlpanel/sectionview.py:41
+ msgid "Changes require restart"
+-msgstr ""
++msgstr "ការ​ប្តូរ​តំរូវ​អោយ​ចាប់​​ផ្តើម​ម៉ាស៊ីន​ឡើង​វិញ"
+ 
+ #: ../src/jarabe/controlpanel/gui.py:300
+ msgid "Cancel changes"
+-msgstr ""
++msgstr "បោះបង់ការប្តូរ"
+ 
+ #: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+ msgid "Later"
+-msgstr ""
++msgstr "បន្ទាប់"
+ 
+ #: ../src/jarabe/controlpanel/gui.py:309
+ msgid "Restart now"
+-msgstr ""
++msgstr "ចាប់​​ផ្តើម​ឡើង​វិញ​ឥឡូវនេះ"
+ 
+ #: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+ msgid "Done"
+@@ -952,84 +973,86 @@ msgstr "រួច​ហើយ"
+ #: ../src/jarabe/controlpanel/toolbar.py:125
+ #: ../src/jarabe/desktop/favoritesview.py:347
+ msgid "Ok"
+-msgstr ""
++msgstr "យល់ព្រម"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:230
+ #, python-format
+ msgid "Version %s"
+-msgstr ""
++msgstr "កំណែ %s"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:356
+ msgid "Confirm erase"
+-msgstr ""
++msgstr "បញ្ជាក់លុបចេញ"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:358
+ #, python-format
+ msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr ""
++msgstr "បញ្ជាក់លុបចេញ តើអ្នកចង់លុបចេញជា​អចិន្ត្រៃយ %s?"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:362
+ #: ../src/jarabe/frame/clipboardmenu.py:67
+ #: ../src/jarabe/view/viewsource.py:280
+ msgid "Keep"
+-msgstr ""
++msgstr "រក្សាទុក"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:365
+ #: ../src/jarabe/desktop/activitieslist.py:419
+-#: ../src/jarabe/journal/journaltoolbox.py:398
++#: ../src/jarabe/journal/journaltoolbox.py:413
+ #: ../src/jarabe/journal/palettes.py:126
+ msgid "Erase"
+-msgstr ""
++msgstr "លុប"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:435
+ msgid "Remove favorite"
+-msgstr ""
++msgstr "យក​ចេញ​ពី​​សំណព្វ"
+ 
+ #: ../src/jarabe/desktop/activitieslist.py:439
+ msgid "Make favorite"
+-msgstr ""
++msgstr "រក្សា​ទុក​សណព្វ"
+ 
+ #. TRANS: label for the freeform layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:127
+ msgid "Freeform"
+-msgstr ""
++msgstr "ទម្រង់​សេរី"
+ 
+ #. TRANS: label for the ring layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:215
+ msgid "Ring"
+-msgstr ""
++msgstr "រោទ៍"
+ 
+ #. TRANS: label for the spiral layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:402
+ msgid "Spiral"
+-msgstr ""
++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 ""
++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 ""
++msgstr "ត្រីកោណ"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:338
+ msgid "Registration Failed"
+-msgstr ""
++msgstr "បរាជ័យ​ចុះ​ឈ្មោះ"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+ msgid "%s"
+-msgstr ""
++msgstr "%s"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:341
+ msgid "Registration Successful"
+-msgstr ""
++msgstr "ចុះ​ឈ្មោះ​បាន​ជោគជ័យ"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:342
+ msgid "You are now registered with your school server."
+-msgstr ""
++msgstr "ឥឡូវ​នេះ​អ្នក​បាន​ចុះ​ឈ្មោះ​ទៅ​ក្នុង​ម៉ាស៊ីន​របស់​សាលា"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:641
+ msgid "Register"
+@@ -1038,55 +1061,57 @@ msgstr "ចុះ​ឈ្មោះ"
+ #: ../src/jarabe/desktop/favoritesview.py:643
+ #: ../src/jarabe/desktop/favoritesview.py:660
+ msgid "Register again"
+-msgstr ""
++msgstr "ចុះឈ្មោះ​​ម្តង​ទៀត"
+ 
+ #: ../src/jarabe/desktop/homebox.py:66
+ msgid "Software Update"
+-msgstr ""
++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 ""
++msgstr "ពិនិត្យមើលឥឡូវនេះ"
+ 
+ #: ../src/jarabe/desktop/homebox.py:197
+ msgid "List view"
+-msgstr ""
++msgstr "បញ្ជីមើល"
+ 
+ #: ../src/jarabe/desktop/homebox.py:198
+ msgid "<Ctrl>2"
+-msgstr ""
++msgstr "<បញ្ជា>២"
+ 
+ #: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+-msgstr ""
++msgstr "ពេញនិយមមើល"
+ 
+ #: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+-msgstr ""
++msgstr "<បញ្ជា>១"
+ 
+ #: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+-msgstr "ប្រភេទ​ឆ្នុច: "
++msgstr "ប្រភេទ​ឆ្នុច ៖"
+ 
+ #: ../src/jarabe/desktop/keydialog.py:163
+ msgid "Authentication Type:"
+-msgstr "ប្រភេទផ្ទៀង: "
++msgstr "ប្រភេទផ្ទៀង ៖"
+ 
+ #: ../src/jarabe/desktop/keydialog.py:229
+ msgid "WPA & WPA2 Personal"
+-msgstr ""
++msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
+ 
+ #: ../src/jarabe/desktop/keydialog.py:238
+ msgid "Wireless Security:"
+-msgstr ""
++msgstr "ប្រព័ន្ធ​សន្តិសុខ​ឥត​ខ្សែ ៖"
+ 
++# TRANS: Action label for resuming an activity.
+ #. TRANS: Action label for resuming an activity.
+ #: ../src/jarabe/desktop/meshbox.py:91
+-#: ../src/jarabe/journal/journaltoolbox.py:494
++#: ../src/jarabe/journal/journaltoolbox.py:509
+ #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+ msgid "Resume"
+ msgstr "បន្ត"
+@@ -1096,63 +1121,64 @@ msgstr "បន្ត"
+ msgid "Join"
+ msgstr "ចូល​រួម"
+ 
+-#: ../src/jarabe/desktop/networkviews.py:500
++#: ../src/jarabe/desktop/networkviews.py:501
+ #, python-format
+ msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#: ../src/jarabe/desktop/networkviews.py:634
+-#, python-format, fuzzy
++#: ../src/jarabe/desktop/networkviews.py:636
++#, python-format
+ msgid "Mesh Network %d"
+-msgstr "បណ្ដាញត"
++msgstr "បណ្ដាញត %d"
+ 
+ #: ../src/jarabe/desktop/schoolserver.py:143
+ msgid "Cannot connect to the server."
+-msgstr ""
++msgstr "មិនអាចតភ្ជាប់ជាមួយម៉ាស៊ីន​មេ"
+ 
+ #: ../src/jarabe/desktop/schoolserver.py:150
+ msgid "The server could not complete the request."
+-msgstr ""
++msgstr "ម៉ាស៊ីន​មេ​មិន​អាច​បញ្ចប់​ដល់​សំណើ"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:187
+ #: ../src/jarabe/frame/activitiestray.py:574
+ msgid "Decline"
+-msgstr ""
++msgstr "ច្រានចោល"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:523
+ #, python-format
+ msgid "%dB"
+-msgstr ""
++msgstr "%dB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:525
+ #, python-format
+ msgid "%dKB"
+-msgstr ""
++msgstr "%dKB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:527
+ #, python-format
+ msgid "%dMB"
+-msgstr ""
++msgstr "%dMB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:544
+ #, python-format
+ msgid "%s of %s"
+-msgstr ""
++msgstr "%s នៃ%s"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:558
+ #, python-format
++#, python-format, fuzzy
+ msgid "Transfer from %s"
+-msgstr ""
++msgstr "ផ្ទេរ​មកពី%r"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:569
+ msgid "Accept"
+-msgstr ""
++msgstr "ព្រមទទួល"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:592
+ #: ../src/jarabe/frame/activitiestray.py:722
+ #, python-format
+ msgid "%s (%s)"
+-msgstr ""
++msgstr "%s (%s)"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:626
+ #: ../src/jarabe/frame/activitiestray.py:639
+@@ -1166,8 +1192,9 @@ msgstr ""
+ 
+ #: ../src/jarabe/frame/activitiestray.py:691
+ #, python-format
++#, python-format, fuzzy
+ msgid "Transfer to %s"
+-msgstr ""
++msgstr "ផ្ទេរ​ទៅ​កាន់ %s"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:56
+ #, fuzzy
+@@ -1182,12 +1209,12 @@ msgstr "បើក"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+-msgstr ""
++msgstr "បើកជាមួយ"
+ 
+ #: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+ msgid "%s clipping"
+-msgstr ""
++msgstr "%s កាត់យកចេញ"
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "Neighborhood"
+@@ -1211,7 +1238,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/intro/window.py:90
+ msgid "Name:"
+-msgstr "ឈ្មោះ: "
++msgstr "ឈ្មោះ"
+ 
+ #: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+@@ -1229,11 +1256,11 @@ msgstr "ថតទៅ​មុខ"
+ #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+ #: ../src/jarabe/journal/volumestoolbar.py:130
+ msgid "Untitled"
+-msgstr ""
++msgstr "គ្មាន​ចំណង​ជើង"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:245
+ msgid "No preview"
+-msgstr ""
++msgstr "អត់មានព្រាង"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:264
+ #, python-format
+@@ -1244,137 +1271,144 @@ msgstr ""
+ #: ../src/jarabe/journal/listmodel.py:150
+ #: ../src/jarabe/journal/listmodel.py:158
+ msgid "Unknown"
+-msgstr ""
++msgstr "មិន​ស្គាល់"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+ msgid "Date: %s"
+-msgstr ""
++msgstr "កាល​បរិច្ឆេទ ៖ %s"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+ msgid "Size: %s"
+-msgstr ""
++msgstr "ទំហំ ៖ %s"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:294
+ #: ../src/jarabe/journal/misc.py:108
+ msgid "No date"
+-msgstr ""
++msgstr "អត់​មាន​ថ្ងៃ​ខែ"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:301
+ msgid "Participants:"
+-msgstr ""
++msgstr "អ្នកចូលរួម ៖"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:323
+ msgid "Description:"
+-msgstr ""
++msgstr "ពិពណ៌នា ៖"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:348
+ msgid "Tags:"
+-msgstr ""
++msgstr "គំនូស ៖"
+ 
+ #: ../src/jarabe/journal/journalactivity.py:115
+-#: ../src/jarabe/journal/journaltoolbox.py:453
++#: ../src/jarabe/journal/journaltoolbox.py:468
+ #: ../src/jarabe/journal/palettes.py:198
+ #: ../src/jarabe/journal/volumestoolbar.py:368
+ msgid "Journal"
+-msgstr ""
++msgstr "កំណត់​ប្រចាំ​ថ្ងៃ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:71
++#: ../src/jarabe/journal/journaltoolbox.py:72
+ msgid "Search"
+-msgstr ""
++msgstr "ស្វែងរក"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:138
++#: ../src/jarabe/journal/journaltoolbox.py:139
+ msgid "Anytime"
+-msgstr ""
++msgstr "វេលា​ណា​ក៏​បាន"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:140
++#: ../src/jarabe/journal/journaltoolbox.py:141
+ msgid "Today"
+-msgstr ""
++msgstr "ថ្ងៃ​នេះ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:142
++#: ../src/jarabe/journal/journaltoolbox.py:143
+ msgid "Since yesterday"
+-msgstr ""
++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
++#: ../src/jarabe/journal/journaltoolbox.py:145
+ msgid "Past week"
+-msgstr ""
++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
++#: ../src/jarabe/journal/journaltoolbox.py:147
+ msgid "Past month"
+-msgstr ""
++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
++#: ../src/jarabe/journal/journaltoolbox.py:149
+ msgid "Past year"
+-msgstr ""
++msgstr "ឆ្នាំ​មុន"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:155
++#: ../src/jarabe/journal/journaltoolbox.py:156
+ msgid "Anyone"
+-msgstr ""
++msgstr "អ្នកណាក៏​ដោយ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:157
++#: ../src/jarabe/journal/journaltoolbox.py:158
+ msgid "My friends"
+-msgstr ""
++msgstr "មិត្ត​ខ្ញុំ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:158
++#: ../src/jarabe/journal/journaltoolbox.py:159
+ msgid "My class"
+-msgstr ""
++msgstr "ថ្នាក់​ខ្ញុំ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:300
++# TRANS: Item in a combo box that filters by entry type.
++#: ../src/jarabe/journal/journaltoolbox.py:301
+ msgid "Anything"
+-msgstr ""
++msgstr "អ្វី​ទាំង​អស់"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/journaltoolbox.py:396
+ #: ../src/jarabe/journal/palettes.py:93
++#, fuzzy
+ msgid "Copy to"
+-msgstr ""
++msgstr "​ចម្លង​ទៅ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/journaltoolbox.py:404
+ #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+ msgid "Duplicate"
+-msgstr ""
++msgstr "ស្ទួន​"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:422
++#: ../src/jarabe/journal/journaltoolbox.py:437
+ #: ../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/journaltoolbox.py:438
+ #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+ #: ../src/jarabe/journal/volumestoolbar.py:316
+ msgid "Error"
+-msgstr ""
++msgstr "កំហុស"
+ 
++# TRANS: Action label for starting an entry.
+ #. TRANS: Action label for starting an entry.
+-#: ../src/jarabe/journal/journaltoolbox.py:497
++#: ../src/jarabe/journal/journaltoolbox.py:512
+ #: ../src/jarabe/journal/palettes.py:74
+ msgid "Start"
+-msgstr ""
++msgstr "ចាប់​ផ្ដើម"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:525
++#: ../src/jarabe/journal/journaltoolbox.py:540
+ msgid "Sort by date modified"
+ msgstr ""
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:526
++#: ../src/jarabe/journal/journaltoolbox.py:541
+ msgid "Sort by date created"
+ msgstr ""
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:527
++#: ../src/jarabe/journal/journaltoolbox.py:542
+ msgid "Sort by size"
+-msgstr ""
++msgstr "តម្រៀប​តាម​ទំហំ"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:536
++#: ../src/jarabe/journal/journaltoolbox.py:551
+ msgid "Sort view"
+ msgstr ""
+ 
+ #: ../src/jarabe/journal/listview.py:316
++#, fuzzy
+ msgid "Your Journal is empty"
+-msgstr ""
++msgstr "ទិនានុប្បវត្តិ​របស់​អ្នក​បាន​ពេញ"
+ 
+ #: ../src/jarabe/journal/listview.py:319
+ msgid "Your documents folder is empty"
+@@ -1390,7 +1424,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/listview.py:397
+ msgid "Clear search"
+-msgstr ""
++msgstr "សំអាតស្វែងរក"
+ 
+ #: ../src/jarabe/journal/misc.py:273
+ #, python-format
+@@ -1404,24 +1438,26 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/modalalert.py:64
+ msgid "Your Journal is full"
+-msgstr ""
++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 ""
++msgstr "បង្ហាញទានានុប្បវត្តិ"
+ 
+ #: ../src/jarabe/journal/objectchooser.py:146
+ msgid "Choose an object"
+-msgstr ""
++msgstr "ជ្រើសរើសវត្ថុ"
+ 
+ #: ../src/jarabe/journal/objectchooser.py:151
+ #: ../src/jarabe/view/viewsource.py:410
+ msgid "Close"
+-msgstr ""
++msgstr "បិទ"
+ 
+ #: ../src/jarabe/journal/palettes.py:72
+ msgid "Resume with"
+@@ -1429,7 +1465,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/palettes.py:75
+ msgid "Start with"
+-msgstr ""
++msgstr "ចាប់​ផ្ដើមជាមួយ"
+ 
+ #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+ msgid "No activity to start entry"
+@@ -1437,11 +1473,11 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/palettes.py:112
+ msgid "Send to"
+-msgstr ""
++msgstr "ផ្ញើទៅកាន់"
+ 
+ #: ../src/jarabe/journal/palettes.py:121
+ msgid "View Details"
+-msgstr ""
++msgstr "មើល​សេចក្តី​លម្អិត"
+ 
+ #: ../src/jarabe/journal/palettes.py:160
+ msgid "Entries without a file cannot be sent."
+@@ -1454,11 +1490,11 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/palettes.py:267
+ msgid "Clipboard"
+-msgstr ""
++msgstr "ក្ដារ​តម្បៀត​ខ្ទាស់"
+ 
+ #: ../src/jarabe/journal/palettes.py:322
+ msgid "No friends present"
+-msgstr ""
++msgstr "គ្មាន​មិត្តភ័ក្ដិ​នៅ​ពេល​នេះ​ទេ"
+ 
+ #: ../src/jarabe/journal/palettes.py:327
+ msgid "No valid connection found"
+@@ -1470,7 +1506,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/volumestoolbar.py:209
+ msgid "Documents"
+-msgstr ""
++msgstr "ឯកសារ"
+ 
+ #: ../src/jarabe/journal/volumestoolbar.py:391
+ #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+@@ -1659,15 +1695,15 @@ msgstr "បិទ"
+ 
+ #: ../src/jarabe/view/buddymenu.py:95
+ msgid "Restart"
+-msgstr ""
++msgstr "ចាប់​ផ្ដើមឡើងវិញ"
+ 
+ #: ../src/jarabe/view/buddymenu.py:101
+ msgid "Logout"
+-msgstr ""
++msgstr "ចាកចេញ"
+ 
+ #: ../src/jarabe/view/buddymenu.py:106
+ msgid "My Settings"
+-msgstr ""
++msgstr "ការ​កំណត់​របស់​ខ្ញុំ"
+ 
+ #: ../src/jarabe/view/buddymenu.py:142
+ #, python-format
+@@ -1690,7 +1726,7 @@ msgstr ""
+ #. TODO: share-with, keep
+ #: ../src/jarabe/view/palettes.py:91
+ msgid "View Source"
+-msgstr ""
++msgstr "មើល​ប្រភព"
+ 
+ #: ../src/jarabe/view/palettes.py:102
+ msgid "Stop"
+@@ -1702,7 +1738,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/view/palettes.py:180
+ msgid "Show contents"
+-msgstr ""
++msgstr "បង្ហាញ​មាតិកា"
+ 
+ #: ../src/jarabe/view/palettes.py:229
+ #, fuzzy
+@@ -1716,7 +1752,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/view/viewsource.py:312
+ msgid "Source"
+-msgstr ""
++msgstr "ប្រភព"
+ 
+ #: ../src/jarabe/view/viewsource.py:374
+ msgid "Activity Bundle Source"
+@@ -1729,15 +1765,32 @@ msgstr ""
+ #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+ #, python-format
+ msgid "View source: %r"
+-msgstr ""
++msgstr "មើល​ប្រភព%r"
+ 
+ #: ../src/jarabe/util/emulator.py:40
+ msgid "Sugar in a window"
+ msgstr ""
+ 
+-#, python-format
+-#~ msgid "Clipboard object: %s."
+-#~ msgstr "ក្ដារ​ខ្ទាស់​វត្ថុ: %s."
++#~ msgid "Copy"
++#~ 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 "Cannot obtain data needed for registration."
++#~ msgstr "មិន​អាច​រក​ឃើញ​ទិន្នន័យ​ដែល​តំរូវ​ការ​ដល់​ការ​ចុះ​ឈ្មោះ​ទេ"
++
++#~ msgid "Unmount"
++#~ msgstr "ដក​ចេញ"
++
++#~ msgid ""
++#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#~ msgstr ""
++#~ "សហគមន៍​បរិស័ទ​កុំព្យូទ័រ​មួយ​សំរាប់​ក្មេង​ម្នាក់ បរិស័ទ​រ៉ែតហែត និង​វិភាគទាន"
+ 
+ #~ msgid "Encryption Type:"
+ #~ msgstr "ប្រភេទ​អ៊ិនគ្រីប: "
+@@ -1750,12 +1803,8 @@ msgstr ""
+ #~ 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 "About my XO"
++#~ msgstr "អំពី​អិកអូ​របស់​ខ្ញុំ"
+ 
+ #~ msgid "Connected to a School Mesh Portal"
+ #~ msgstr "ផ្ជាប់នឹង​បណ្តាញ​ត​របស់​សាលា"
+@@ -1778,6 +1827,10 @@ msgstr ""
+ #~ msgid "Unknown Mesh"
+ #~ msgstr "បណ្ដាញ​គ្មាន​សំគាល់"
+ 
++#, python-format
++#~ msgid "Clipboard object: %s."
++#~ msgstr "ក្ដារ​ខ្ទាស់​វត្ថុ: %s."
++
+ #~ msgid "off"
+ #~ msgstr "បិត"
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0004-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0004-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..0dfe991
--- /dev/null
+++ b/rpms/sugar/0004-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,1485 @@
+From d3f897b11d0d7c6fcbbb3cef359c2e9f75b6f50f Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Sun, 20 Nov 2011 02:39:51 +0200
+Subject: [PATCH sugar 04/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 202 of 379 messages translated (15
+ fuzzy).
+
+---
+ po/quz.po |  414 +++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 211 insertions(+), 203 deletions(-)
+
+diff --git a/po/quz.po b/po/quz.po
+index dae29d9..8ef1d33 100644
+--- a/po/quz.po
++++ b/po/quz.po
+@@ -1,11 +1,12 @@
++# Amos Batto <amosbatt@yahoo.com>, 2011.
+ 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"
++"PO-Revision-Date: 2011-11-20 01:55+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: Runasimipi.org\n"
+ "Language: quz\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,12 +17,12 @@ msgstr ""
+ #  "Acerca de mí"
+ #: ../extensions/cpsection/aboutme/__init__.py:24
+ msgid "About Me"
+-msgstr "nuqamanta"
++msgstr "Nuqamanta"
+ 
+ #  "Debe ingresar un nombre."
+ #: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr "sutiyquita churay"
++msgstr "Sutiykitapuni churay."
+ 
+ #  "borde:   color=%s tonalidad=%s"
+ #: ../extensions/cpsection/aboutme/model.py:75
+@@ -39,39 +40,39 @@ msgstr "muyunkuna: %s"
+ #: ../extensions/cpsection/aboutme/model.py:80
+ #, python-format
+ msgid "fill:     color=%s hue=%s"
+-msgstr ""
++msgstr "hunt'ana:     llimp'i=%s tonalidad=%s\""
+ 
+ #  "relleno:     %s"
+ #: ../extensions/cpsection/aboutme/model.py:82
+ #, python-format
+ msgid "fill:     %s"
+-msgstr ""
++msgstr "hunt'ana:  %s"
+ 
+ #  "Error en modificadores de color especificados."
+ #: ../extensions/cpsection/aboutme/model.py:94
+ msgid "Error in specified color modifiers."
+-msgstr "Pantay kutirichin lip'i misqakuna"
++msgstr "Pantay aqllasqa llimp'ikunapi."
+ 
+ #  "Error en colores especificados."
+ #: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+-msgstr "Pantay lip'i misqakunapi"
++msgstr "Pantay aqllasqa llimp'ikunapi"
+ 
+ #  "Clic para cambiar su color:"
+ #: ../extensions/cpsection/aboutme/view.py:235
+ #, fuzzy
+ msgid "Click to change your color:"
+-msgstr "Ñ'itiy chhalanayquipaq"
++msgstr "Llimp'iykita aqllanapaq klik ruway:"
+ 
+ #  "Acerca de mi computadora"
+ #: ../extensions/cpsection/aboutcomputer/__init__.py:21
+ msgid "About my Computer"
+-msgstr "computadora manta"
++msgstr "Computadoraymanta"
+ 
+ #  "No disponible"
+ #: ../extensions/cpsection/aboutcomputer/model.py:42
+ msgid "Not available"
+-msgstr ""
++msgstr "Mana jap'ikunchu"
+ 
+ #  "%(interface)s: %(version)s"
+ #: ../extensions/cpsection/aboutcomputer/model.py:171
+@@ -82,22 +83,22 @@ msgstr "%(interface)s: %(version)s"
+ #  "Identidad"
+ #: ../extensions/cpsection/aboutcomputer/view.py:61
+ msgid "Identity"
+-msgstr "kausaypi"
++msgstr "Kawsaypi"
+ 
+ #  "Número de serie:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:70
+ msgid "Serial Number:"
+-msgstr "Yupaska"
++msgstr "Yupana serial nisqa:"
+ 
+ #  "Software"
+ #: ../extensions/cpsection/aboutcomputer/view.py:92
+ msgid "Software"
+-msgstr ""
++msgstr "Software"
+ 
+ #  "Ensamble:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:101
+ msgid "Build:"
+-msgstr "Ensamble:"
++msgstr "Ruwasqa kuti:"
+ 
+ #  "Azúcar:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:116
+@@ -134,39 +135,40 @@ msgstr ""
+ #  "Licencia completa:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:200
+ msgid "Full license:"
+-msgstr "Lli'punte mañacuy"
++msgstr "Lli'punte mañakuy"
+ 
+ #  "Fecha y hora"
+ #: ../extensions/cpsection/datetime/__init__.py:21
+ msgid "Date & Time"
+-msgstr "Kay punchay"
++msgstr "Punchaypis Horapis"
+ 
+ #  "Error, zona horaria no existe."
+ #: ../extensions/cpsection/datetime/model.py:92
+ #, fuzzy
+ msgid "Error timezone does not exist."
+-msgstr "Pantasonque yau"
++msgstr "Pantay: horaqpa suyun mana kanchu."
+ 
+ #  "Zona horaria"
+ #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+-msgstr "Punchaycuna"
++msgstr "Horaqpa suyun"
+ 
+ #  "Cuadro"
+ #: ../extensions/cpsection/frame/__init__.py:21
++#, fuzzy
+ msgid "Frame"
+-msgstr "muyuycunapi"
++msgstr "Muyuykunapi"
+ 
+ #  "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"
++msgstr "Tukuy kanan huk llipin yupana"
+ 
+ #  "nunca"
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr "haykaqpis"
++msgstr "Ni haykaqpis"
+ 
+ #  "instantáneo"
+ #: ../extensions/cpsection/frame/view.py:28
+@@ -177,12 +179,12 @@ msgstr "usqhay"
+ #: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+ msgid "%s seconds"
+-msgstr "%s iskay kaq"
++msgstr "%s segundokuna"
+ 
+ #  "Retraso de activación"
+ #: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+-msgstr "qallariy qhipay"
++msgstr "Qallarinapaq qhipay"
+ 
+ #  "Esquina"
+ #: ../extensions/cpsection/frame/view.py:78
+@@ -192,7 +194,7 @@ msgstr "Muyurina"
+ #  "Borde"
+ #: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+-msgstr "muyumnim"
++msgstr "Muyumnim"
+ 
+ #  "Teclado"
+ #: ../extensions/cpsection/keyboard/__init__.py:21
+@@ -209,7 +211,7 @@ 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"
++msgstr "Ñit'ina wakpaq ñit'ina(kuna)"
+ 
+ #  "Diseño(s) de teclado"
+ #: ../extensions/cpsection/keyboard/view.py:319
+@@ -227,13 +229,13 @@ msgstr "Simi"
+ #: ../extensions/cpsection/language/model.py:30
+ #, fuzzy
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "Mana aticunchu waykuy ~/.i18n."
++msgstr "Mana \"~/.i18n\"pi yaykuyta atikunchu.   "
+ 
+ #  "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 ""
++msgstr "Chimpu=%s, chay simi mana riqsisqachu.  "
+ 
+ #  "Lo siento, yo no hablo '%s'."
+ #: ../extensions/cpsection/language/model.py:152
+@@ -253,22 +255,22 @@ msgstr "Huk rimay managanchu warza ruway."
+ #  "Configuración del módem"
+ #: ../extensions/cpsection/modemconfiguration/__init__.py:21
+ msgid "Modem Configuration"
+-msgstr ""
++msgstr "Modem nisqata kamachina"
+ 
+ #  "Nombre de usuario:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:94
+ msgid "Username:"
+-msgstr "Runa Suti:"
++msgstr "Runa suti:"
+ 
+ #  "Contraseña:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:106
+ msgid "Password:"
+-msgstr ""
++msgstr "Pakasqa simi"
+ 
+ #  "Número:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:118
+ msgid "Number:"
+-msgstr "Yupay:"
++msgstr "Yupana:"
+ 
+ #  "Nombre de punto de acceso (APN):"
+ #: ../extensions/cpsection/modemconfiguration/view.py:130
+@@ -302,7 +304,7 @@ msgstr "Llik'a"
+ #  "Estado desconocido."
+ #: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+-msgstr "Ima mana riqsiska"
++msgstr "Ima mana riqsisqa."
+ 
+ #  "Error en argumento especificado de radio use on/off."
+ #: ../extensions/cpsection/network/model.py:99
+@@ -317,7 +319,7 @@ msgstr ""
+ #  "Inalámbrica"
+ #: ../extensions/cpsection/network/view.py:61
+ msgid "Wireless"
+-msgstr ""
++msgstr "Inalámbrica"
+ 
+ #  "Apague la radio inalámbrica y ahorre vida de batería"
+ #: ../extensions/cpsection/network/view.py:69
+@@ -337,12 +339,12 @@ msgstr ""
+ #  "Descarte historial de la red"
+ #: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+-msgstr ""
++msgstr "Llik'amanta yuyarinata chinkachiy"
+ 
+ #  "Colaboración"
+ #: ../extensions/cpsection/network/view.py:122
+ msgid "Collaboration"
+-msgstr ""
++msgstr "Yanapanakuna"
+ 
+ #  "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."
+@@ -356,12 +358,12 @@ msgstr ""
+ #  "Servidor:"
+ #: ../extensions/cpsection/network/view.py:140
+ msgid "Server:"
+-msgstr ""
++msgstr "Sirwidur:"
+ 
+ #  "Energía"
+ #: ../extensions/cpsection/power/__init__.py:21
+ msgid "Power"
+-msgstr ""
++msgstr "Atina"
+ 
+ #  "Error en argumento automático de manejo de energía, use on/off."
+ #: ../extensions/cpsection/power/model.py:90
+@@ -376,7 +378,7 @@ msgstr ""
+ #  "Manejo de energía"
+ #: ../extensions/cpsection/power/view.py:48
+ msgid "Power management"
+-msgstr ""
++msgstr "Energia nisqap kamachinan"
+ 
+ #  "Manejo automático de energía (incrementa la vida de la batería)"
+ #: ../extensions/cpsection/power/view.py:58
+@@ -393,7 +395,7 @@ msgstr ""
+ #  "Actualización de software"
+ #: ../extensions/cpsection/updater/__init__.py:21
+ msgid "Software update"
+-msgstr ""
++msgstr "Software kunanchana"
+ 
+ #  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+ #  "de seguridad y proveen nuevas características."
+@@ -407,24 +409,24 @@ msgstr ""
+ #: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+ msgid "Checking %s..."
+-msgstr ""
++msgstr "\"%s\"ta mallichkan... "
+ 
+ #  "Descargando %s..."
+ #: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+ msgid "Downloading %s..."
+-msgstr ""
++msgstr "\"%s\"ta urayachispa..."
+ 
+ #  "Actualizando %s..."
+ #: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+ msgid "Updating %s..."
+-msgstr ""
++msgstr "\"%s\"ta kunanchachkan..."
+ 
+ #  "Tu software esta actualizado"
+ #: ../extensions/cpsection/updater/view.py:139
+ msgid "Your software is up-to-date"
+-msgstr ""
++msgstr "Softwara nisqaykita kunanchanña"
+ 
+ #  "Puedes instalar %s actualización"
+ #  "Puedes instalar %s actualizaciones"
+@@ -432,18 +434,18 @@ msgstr ""
+ #, python-format
+ msgid "You can install %s update"
+ msgid_plural "You can install %s updates"
+-msgstr[0] ""
++msgstr[0] "%s kunanchanata churayta atinki"
+ msgstr[1] ""
+ 
+ #  "Buscando actualizaciones..."
+ #: ../extensions/cpsection/updater/view.py:159
+ msgid "Checking for updates..."
+-msgstr ""
++msgstr "Kunanchanakunata maskhachkan..."
+ 
+ #  "Instalando actualizaciones..."
+ #: ../extensions/cpsection/updater/view.py:164
+ msgid "Installing updates..."
+-msgstr ""
++msgstr "Kunanchanakunata churachkan..."
+ 
+ #  "%s actualización fue instalada"
+ #  "%s actualizaciones fueron instaladas"
+@@ -451,88 +453,88 @@ msgstr ""
+ #, python-format
+ msgid "%s update was installed"
+ msgid_plural "%s updates were installed"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%s kunanchanata churaran "
++msgstr[1] "%s kunanchanakunata churaran"
+ 
+ #  "Instalación seleccionada"
+ #: ../extensions/cpsection/updater/view.py:255
+ msgid "Install selected"
+-msgstr ""
++msgstr "Aqllasqa churanapaq "
+ 
+ #  "Tamaño de descarga: %s"
+ #: ../extensions/cpsection/updater/view.py:276
+ #, python-format
+ msgid "Download size: %s"
+-msgstr ""
++msgstr "Urayachinapaq jayk'a: %s"
+ 
+ #  "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 ""
++msgstr "%(current)s kutimanta %(new)s kutiman (Jayk'a: %(size)s)"
+ 
+ #  "Ninguno"
+ #. TRANS: download size is 0
+ #: ../extensions/cpsection/updater/view.py:382
+ msgid "None"
+-msgstr ""
++msgstr "Ni ima"
+ 
+ #  "1 KB"
+ #. TRANS: download size of very small updates
+ #: ../extensions/cpsection/updater/view.py:385
+ msgid "1 KB"
+-msgstr ""
++msgstr "1 KB"
+ 
+ #  "%.0f KB"
+ #. TRANS: download size of small updates, e.g. '250 KB'
+ #: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+ msgid "%.0f KB"
+-msgstr ""
++msgstr "%.0f KB"
+ 
+ #  "%.1f MB"
+ #. TRANS: download size of updates, e.g. '2.3 MB'
+ #: ../extensions/cpsection/updater/view.py:391
+ #, python-format
+ msgid "%.1f MB"
+-msgstr ""
++msgstr "%.1f MB"
+ 
+ #  "Mi batería"
+ #: ../extensions/deviceicon/battery.py:71
+ msgid "My Battery"
+-msgstr ""
++msgstr "Bateria nisqay"
+ 
+ #  "Eliminado"
+ #: ../extensions/deviceicon/battery.py:147
+ msgid "Removed"
+-msgstr ""
++msgstr "Mana t'inkisqa"
+ 
+ #  "Cargando"
+ #: ../extensions/deviceicon/battery.py:150
+ msgid "Charging"
+-msgstr ""
++msgstr "Hunt'achkan"
+ 
+ #  "Queda muy poca batería"
+ #: ../extensions/deviceicon/battery.py:153
+ msgid "Very little power remaining"
+-msgstr ""
++msgstr "Bateriamanta pisillata kachkan"
+ 
+ #  "Quedan %(hour)d:%(min).2d"
+ #: ../extensions/deviceicon/battery.py:158
+ #, python-format
+ msgid "%(hour)d:%(min).2d remaining"
+-msgstr ""
++msgstr "%(hour)d:%(min).2d qhipachkan"
+ 
+ #  "Cargada"
+ #: ../extensions/deviceicon/battery.py:161
+ msgid "Charged"
+-msgstr ""
++msgstr "Huntasqaña"
+ 
+ #  "Direccion IP: %s"
+ #: ../extensions/deviceicon/network.py:49
+ #, python-format
+ msgid "IP address: %s"
+-msgstr ""
++msgstr "Direccion IP: %s"
+ 
+ #  "Desconectar"
+ #: ../extensions/deviceicon/network.py:104
+@@ -540,7 +542,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:140
+ #: ../src/jarabe/desktop/networkviews.py:508
+ msgid "Disconnect"
+-msgstr ""
++msgstr "T'aqachiy"
+ 
+ #  "Conectando..."
+ #: ../extensions/deviceicon/network.py:112
+@@ -549,7 +551,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:547
+ #: ../src/jarabe/desktop/networkviews.py:680
+ msgid "Connecting..."
+-msgstr ""
++msgstr "T'inkichachkan..."
+ 
+ #  "Conectado"
+ #: ../extensions/deviceicon/network.py:117
+@@ -558,12 +560,12 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:553
+ #: ../src/jarabe/desktop/networkviews.py:686
+ msgid "Connected"
+-msgstr ""
++msgstr "T'inkisqa"
+ 
+ #  "No hay conexión inalámbrica"
+ #: ../extensions/deviceicon/network.py:130
+ msgid "No wireless connection"
+-msgstr ""
++msgstr "Inalámbrica t'inkina mana kanchu."
+ 
+ #  "Canal"
+ #: ../extensions/deviceicon/network.py:144
+@@ -573,7 +575,7 @@ msgstr ""
+ #  "Red Cableada"
+ #: ../extensions/deviceicon/network.py:159
+ msgid "Wired Network"
+-msgstr ""
++msgstr "Cableada llik'a"
+ 
+ #  "Velocidad"
+ #: ../extensions/deviceicon/network.py:188
+@@ -583,12 +585,12 @@ msgstr ""
+ #  "Módem inalámbrico"
+ #: ../extensions/deviceicon/network.py:213
+ msgid "Wireless modem"
+-msgstr ""
++msgstr "Módem inalámbrico"
+ 
+ #  "Espere por favor..."
+ #: ../extensions/deviceicon/network.py:281
+ msgid "Please wait..."
+-msgstr ""
++msgstr "Suyariy..."
+ 
+ #  "Conectar"
+ #: ../extensions/deviceicon/network.py:286
+@@ -596,12 +598,12 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:504
+ #: ../src/jarabe/desktop/networkviews.py:637
+ msgid "Connect"
+-msgstr ""
++msgstr "T'inkiy"
+ 
+ #  "Desconectado"
+ #: ../extensions/deviceicon/network.py:287
+ msgid "Disconnected"
+-msgstr ""
++msgstr "Mana t'inkisqachu"
+ 
+ #  "Cancelar"
+ #: ../extensions/deviceicon/network.py:294
+@@ -611,7 +613,7 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:704
+ #: ../src/jarabe/frame/activitiestray.py:732
+ msgid "Cancel"
+-msgstr ""
++msgstr "Chinkachiy"
+ 
+ #  "Probar la conexión nuevamente"
+ #: ../extensions/deviceicon/network.py:333
+@@ -622,13 +624,13 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:336
+ #, python-format
+ msgid "Error: %s"
+-msgstr ""
++msgstr "Pantay: %s"
+ 
+ #  "Sugerencia: %s"
+ #: ../extensions/deviceicon/network.py:340
+ #, python-format
+ msgid "Suggestion: %s"
+-msgstr ""
++msgstr "Allinchanapaq: %s"
+ 
+ #  "Conectado a %s"
+ #: ../extensions/deviceicon/network.py:349
+@@ -641,38 +643,38 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:356
+ #, python-format
+ msgid "%d KB"
+-msgstr ""
++msgstr "%d KB"
+ 
+ #  "Revise la configuración de su Pin/Puk."
+ #: ../extensions/deviceicon/network.py:361
+ msgid "Check your Pin/Puk configuration."
+-msgstr ""
++msgstr "PIN/PUK kamachinaykita chiqaqchay."
+ 
+ #  "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 ""
++msgstr "Nombre de punto de acceso (APN) kamachinata chiqaqchay"
+ 
+ #  "Revise el Número en la configuración."
+ #: ../extensions/deviceicon/network.py:368
+ msgid "Check the Number configuration."
+-msgstr ""
++msgstr "Yupanap kamachinanta chiqaqchay."
+ 
+ #  "Revise su configuración."
+ #: ../extensions/deviceicon/network.py:370
+ msgid "Check your configuration."
+-msgstr ""
++msgstr "Kamachinaykita chiqaqchay."
+ 
+ #  "Red Malla"
+ #: ../extensions/deviceicon/network.py:612
+ msgid "Mesh Network"
+-msgstr ""
++msgstr "Red Malla"
+ 
+ #  "Red Malla %s"
+ #: ../extensions/deviceicon/network.py:656
+ #, python-format
+ msgid "Mesh Network %s"
+-msgstr ""
++msgstr "Red Malla %s"
+ 
+ #  "No se dispone de conexión GSM."
+ #: ../extensions/deviceicon/network.py:779
+@@ -687,7 +689,7 @@ msgstr ""
+ #  "Mis parlantes"
+ #: ../extensions/deviceicon/speaker.py:61
+ msgid "My Speakers"
+-msgstr ""
++msgstr "Parlante nisqaykuna"
+ 
+ #  "Dar voz"
+ #: ../extensions/deviceicon/speaker.py:138
+@@ -697,22 +699,22 @@ msgstr ""
+ #  "Silenciar"
+ #: ../extensions/deviceicon/speaker.py:141
+ msgid "Mute"
+-msgstr ""
++msgstr "Ch'inyachiy"
+ 
+ #  "dedo"
+ #: ../extensions/deviceicon/touchpad.py:38
+ msgid "finger"
+-msgstr ""
++msgstr "ruk'ana"
+ 
+ #  "estilo"
+ #: ../extensions/deviceicon/touchpad.py:39
+ msgid "stylus"
+-msgstr ""
++msgstr "qillqana"
+ 
+ #  "Mi superficie táctil"
+ #: ../extensions/deviceicon/touchpad.py:68
+ msgid "My touchpad"
+-msgstr ""
++msgstr "Mi superficie táctil"
+ 
+ #  "Malla"
+ #: ../extensions/globalkey/screenshot.py:59
+@@ -723,13 +725,13 @@ msgstr ""
+ #: ../extensions/globalkey/screenshot.py:61
+ #: ../src/jarabe/frame/zoomtoolbar.py:41
+ msgid "Group"
+-msgstr ""
++msgstr "Huñu"
+ 
+ #  "Hogar"
+ #: ../extensions/globalkey/screenshot.py:63
+ #: ../src/jarabe/frame/zoomtoolbar.py:43
+ msgid "Home"
+-msgstr ""
++msgstr "Wasi"
+ 
+ #  "Actividad"
+ #: ../extensions/globalkey/screenshot.py:69
+@@ -784,7 +786,7 @@ msgstr ""
+ #  "Retraso de las Esquinas"
+ #: ../data/sugar.schemas.in.h:6
+ msgid "Corner Delay"
+-msgstr ""
++msgstr "K'uchupi suyana"
+ 
+ #  "Tipo de letra predeterminado"
+ #: ../data/sugar.schemas.in.h:7
+@@ -999,22 +1001,22 @@ msgstr ""
+ #  "Mostrar Terminar Sesión"
+ #: ../data/sugar.schemas.in.h:47
+ msgid "Show Log out"
+-msgstr ""
++msgstr "Lluqsinata rikhurichiy"
+ 
+ #  "Mostrar Reiniciar"
+ #: ../data/sugar.schemas.in.h:48
+ msgid "Show Restart"
+-msgstr ""
++msgstr "Qallarinata rikhurichiy"
+ 
+ #  "Mostrar redes específicas de Azúcar"
+ #: ../data/sugar.schemas.in.h:49
+ msgid "Show Sugar Ad-hoc networks"
+-msgstr ""
++msgstr "Azucarpa llik'akunanta rikhurichiy"
+ 
+ #  "Sonido silenciado"
+ #: ../data/sugar.schemas.in.h:50
+ msgid "Sound Muted"
+-msgstr ""
++msgstr "Ch'inyachisqa"
+ 
+ #  "El modelo del teclado que se utilizará"
+ #: ../data/sugar.schemas.in.h:51
+@@ -1039,12 +1041,12 @@ msgstr ""
+ #  "Color del usuario"
+ #: ../data/sugar.schemas.in.h:56
+ msgid "User Color"
+-msgstr ""
++msgstr "Hap'iqmasip llimp'in"
+ 
+ #  "Nombre de usuario"
+ #: ../data/sugar.schemas.in.h:57
+ msgid "User Name"
+-msgstr ""
++msgstr "Hap'iqmasip sutin"
+ 
+ #  "Nombre de usuario que se utiliza en todo el escritorio."
+ #: ../data/sugar.schemas.in.h:58
+@@ -1061,7 +1063,7 @@ msgstr ""
+ #  "Nivel de volumen"
+ #: ../data/sugar.schemas.in.h:60
+ msgid "Volume Level"
+-msgstr ""
++msgstr "Hayk'a chanra"
+ 
+ #  "Nivel de volumen para el dispositivo de sonido."
+ #: ../data/sugar.schemas.in.h:61
+@@ -1133,7 +1135,7 @@ msgstr ""
+ #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
+ #: ../src/jarabe/journal/volumestoolbar.py:307
+ msgid "Warning"
+-msgstr ""
++msgstr "Willay"
+ 
+ #  "Los cambios requieren reiniciar"
+ #: ../src/jarabe/controlpanel/gui.py:297
+@@ -1149,17 +1151,17 @@ msgstr ""
+ #  "Después"
+ #: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+ msgid "Later"
+-msgstr ""
++msgstr "Qhipamanta"
+ 
+ #  "Reiniciar ahora"
+ #: ../src/jarabe/controlpanel/gui.py:309
+ msgid "Restart now"
+-msgstr ""
++msgstr "Kunan qallariy"
+ 
+ #  "Hecho"
+ #: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+ msgid "Done"
+-msgstr ""
++msgstr "Ruwasqaña"
+ 
+ #  "Aceptar"
+ #: ../src/jarabe/controlpanel/toolbar.py:125
+@@ -1171,7 +1173,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/activitieslist.py:230
+ #, python-format
+ msgid "Version %s"
+-msgstr ""
++msgstr "Kuti %s"
+ 
+ #  "Confirmar borrado"
+ #: ../src/jarabe/desktop/activitieslist.py:356
+@@ -1197,17 +1199,17 @@ msgstr ""
+ #: ../src/jarabe/journal/journaltoolbox.py:398
+ #: ../src/jarabe/journal/palettes.py:126
+ msgid "Erase"
+-msgstr ""
++msgstr "Chinkachiy"
+ 
+ #  "Remover favorito"
+ #: ../src/jarabe/desktop/activitieslist.py:435
+ msgid "Remove favorite"
+-msgstr ""
++msgstr "Aqllasqata chinkachiy"
+ 
+ #  "Hacer favorito"
+ #: ../src/jarabe/desktop/activitieslist.py:439
+ msgid "Make favorite"
+-msgstr ""
++msgstr "Aqllasqata ruway"
+ 
+ #  "Forma libre"
+ #. TRANS: label for the freeform layout in the favorites view
+@@ -1219,25 +1221,26 @@ msgstr ""
+ #. TRANS: label for the ring layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:215
+ msgid "Ring"
+-msgstr ""
++msgstr "Siwi"
+ 
+ #  "Espiral"
+ #. TRANS: label for the spiral layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:402
+ msgid "Spiral"
+-msgstr ""
++msgstr "Espiral"
+ 
+ #  "Caja"
+ #. TRANS: label for the box layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:472
++#, fuzzy
+ msgid "Box"
+-msgstr ""
++msgstr "P'uktaki"
+ 
+ #  "Triángulo"
+ #. TRANS: label for the box layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:515
+ msgid "Triangle"
+-msgstr ""
++msgstr "Kimsak'uchu"
+ 
+ #  "Error al registrar"
+ #: ../src/jarabe/desktop/favoritesview.py:338
+@@ -1248,7 +1251,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+ msgid "%s"
+-msgstr ""
++msgstr "%s"
+ 
+ #  "Registro exitoso"
+ #: ../src/jarabe/desktop/favoritesview.py:341
+@@ -1274,7 +1277,7 @@ msgstr ""
+ #  "Actualización de Software"
+ #: ../src/jarabe/desktop/homebox.py:66
+ msgid "Software Update"
+-msgstr ""
++msgstr "Software kunanchana"
+ 
+ #  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+ #: ../src/jarabe/desktop/homebox.py:67
+@@ -1284,27 +1287,27 @@ msgstr ""
+ #  "Pruebe ahora"
+ #: ../src/jarabe/desktop/homebox.py:76
+ msgid "Check now"
+-msgstr ""
++msgstr "Kunan chiqaqchay"
+ 
+ #  "Vista en lista"
+ #: ../src/jarabe/desktop/homebox.py:197
+ msgid "List view"
+-msgstr ""
++msgstr "Siqipi qhaway"
+ 
+ #  "<Ctrl>2"
+ #: ../src/jarabe/desktop/homebox.py:198
+ msgid "<Ctrl>2"
+-msgstr ""
++msgstr "<Ctrl>2"
+ 
+ #  "Vista de favoritos"
+ #: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+-msgstr ""
++msgstr "Aqllasqakuna qhaway"
+ 
+ #  "<Ctrl>1"
+ #: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+-msgstr ""
++msgstr "<Ctrl>1"
+ 
+ #  "Tipo de clave:"
+ #: ../src/jarabe/desktop/keydialog.py:143
+@@ -1332,13 +1335,13 @@ msgstr ""
+ #: ../src/jarabe/journal/journaltoolbox.py:494
+ #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+ msgid "Resume"
+-msgstr ""
++msgstr "Hukmanta ruway"
+ 
+ #  "Unirse"
+ #: ../src/jarabe/desktop/meshbox.py:96
+ #: ../src/jarabe/frame/activitiestray.py:182
+ msgid "Join"
+-msgstr ""
++msgstr "Huñunakuy"
+ 
+ #  "Red específica %d"
+ #: ../src/jarabe/desktop/networkviews.py:500
+@@ -1355,7 +1358,7 @@ msgstr ""
+ #  "No se puede conectar al servidor."
+ #: ../src/jarabe/desktop/schoolserver.py:143
+ msgid "Cannot connect to the server."
+-msgstr ""
++msgstr "Servidorman mana t'inkiyta atinchu"
+ 
+ #  "El servidor no pudo completar el pedido."
+ #: ../src/jarabe/desktop/schoolserver.py:150
+@@ -1366,56 +1369,56 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:187
+ #: ../src/jarabe/frame/activitiestray.py:574
+ msgid "Decline"
+-msgstr ""
++msgstr "Ama niy"
+ 
+ #  "%dB"
+ #: ../src/jarabe/frame/activitiestray.py:523
+ #, python-format
+ msgid "%dB"
+-msgstr ""
++msgstr "%dB"
+ 
+ #  "%dKB"
+ #: ../src/jarabe/frame/activitiestray.py:525
+ #, python-format
+ msgid "%dKB"
+-msgstr ""
++msgstr "%dKB"
+ 
+ #  "%dMB"
+ #: ../src/jarabe/frame/activitiestray.py:527
+ #, python-format
+ msgid "%dMB"
+-msgstr ""
++msgstr "%dMB"
+ 
+ #  "%s de %s"
+ #: ../src/jarabe/frame/activitiestray.py:544
+ #, python-format
+ msgid "%s of %s"
+-msgstr ""
++msgstr "%s de %s"
+ 
+ #  "Transferencia desde %s"
+ #: ../src/jarabe/frame/activitiestray.py:558
+ #, python-format
+ msgid "Transfer from %s"
+-msgstr ""
++msgstr "%s manta apachina"
+ 
+ #  "Aceptar"
+ #: ../src/jarabe/frame/activitiestray.py:569
+ msgid "Accept"
+-msgstr ""
++msgstr "Ari niy"
+ 
+ #  "%s (%s)"
+ #: ../src/jarabe/frame/activitiestray.py:592
+ #: ../src/jarabe/frame/activitiestray.py:722
+ #, python-format
+ msgid "%s (%s)"
+-msgstr ""
++msgstr "%s (%s)"
+ 
+ #  "Descartar"
+ #: ../src/jarabe/frame/activitiestray.py:626
+ #: ../src/jarabe/frame/activitiestray.py:639
+ #: ../src/jarabe/frame/activitiestray.py:757
+ msgid "Dismiss"
+-msgstr ""
++msgstr "Qhichuy"
+ 
+ #  "El otro participante canceló la transferencia del archivo"
+ #: ../src/jarabe/frame/activitiestray.py:643
+@@ -1426,86 +1429,86 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:691
+ #, python-format
+ msgid "Transfer to %s"
+-msgstr ""
++msgstr "%sman apachiy"
+ 
+ #  "Eliminar"
+ #: ../src/jarabe/frame/clipboardmenu.py:56
+ msgid "Remove"
+-msgstr ""
++msgstr "Chinkachiy"
+ 
+ #  "Abrir"
+ #: ../src/jarabe/frame/clipboardmenu.py:62
+ #: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+-msgstr ""
++msgstr "Kichay"
+ 
+ #  "Abrir con"
+ #: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+-msgstr ""
++msgstr "Imawan kichay"
+ 
+ #  "recorte de %s"
+ #: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+ msgid "%s clipping"
+-msgstr ""
++msgstr "%s nisqaqpa rutuynin"
+ 
+ #  "Vecindario"
+ #: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "Neighborhood"
+-msgstr ""
++msgstr "Suyucha"
+ 
+ #  "F1"
+ #: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "F1"
+-msgstr ""
++msgstr "F1"
+ 
+ #  "F2"
+ #: ../src/jarabe/frame/zoomtoolbar.py:41
+ msgid "F2"
+-msgstr ""
++msgstr "F2"
+ 
+ #  "F3"
+ #: ../src/jarabe/frame/zoomtoolbar.py:43
+ msgid "F3"
+-msgstr ""
++msgstr "F3"
+ 
+ #  "F4"
+ #: ../src/jarabe/frame/zoomtoolbar.py:45
+ msgid "F4"
+-msgstr ""
++msgstr "F4"
+ 
+ #  "Nombre:"
+ #: ../src/jarabe/intro/window.py:90
+ msgid "Name:"
+-msgstr ""
++msgstr "Suti:"
+ 
+ #  "Clic para cambiar de color:"
+ #: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+-msgstr ""
++msgstr "Llimp'ita tikranapaq klik ruway:"
+ 
+ #  "Atrás"
+ #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+ msgid "Back"
+-msgstr ""
++msgstr "Kutichiy"
+ 
+ #  "Siguiente"
+ #: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+-msgstr ""
++msgstr "Qatiq"
+ 
+ #  "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 ""
++msgstr "Mana sutiyuq"
+ 
+ #  "Sin vista previa"
+ #: ../src/jarabe/journal/expandedentry.py:245
+ msgid "No preview"
+-msgstr ""
++msgstr "Qhawanaraq mana kanchu"
+ 
+ #  "Tipo: %s"
+ #: ../src/jarabe/journal/expandedentry.py:264
+@@ -1518,25 +1521,25 @@ msgstr ""
+ #: ../src/jarabe/journal/listmodel.py:150
+ #: ../src/jarabe/journal/listmodel.py:158
+ msgid "Unknown"
+-msgstr ""
++msgstr "Mana riqsisqachu"
+ 
+ #  "Fecha: %s"
+ #: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+ msgid "Date: %s"
+-msgstr ""
++msgstr "Punchay: %s"
+ 
+ #  "Tamaño: %s"
+ #: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+ msgid "Size: %s"
+-msgstr ""
++msgstr "Sayaynin: %s"
+ 
+ #  "Sin fecha"
+ #: ../src/jarabe/journal/expandedentry.py:294
+ #: ../src/jarabe/journal/misc.py:108
+ msgid "No date"
+-msgstr ""
++msgstr "Mana p'unchawyuq"
+ 
+ #  "Participantes:"
+ #: ../src/jarabe/journal/expandedentry.py:301
+@@ -1546,7 +1549,7 @@ msgstr ""
+ #  "Descripción:"
+ #: ../src/jarabe/journal/expandedentry.py:323
+ msgid "Description:"
+-msgstr ""
++msgstr "Aswan willay:"
+ 
+ #  "Etiquetas:"
+ #: ../src/jarabe/journal/expandedentry.py:348
+@@ -1564,40 +1567,40 @@ msgstr ""
+ #  "Buscar"
+ #: ../src/jarabe/journal/journaltoolbox.py:71
+ msgid "Search"
+-msgstr ""
++msgstr "Maskhay"
+ 
+ #  "Cualquier momento"
+ #: ../src/jarabe/journal/journaltoolbox.py:138
+ msgid "Anytime"
+-msgstr ""
++msgstr "Tukuy pacha"
+ 
+ #  "Hoy"
+ #: ../src/jarabe/journal/journaltoolbox.py:140
+ msgid "Today"
+-msgstr ""
++msgstr "Kunan p'unchaw"
+ 
+ #  "Desde ayer"
+ #: ../src/jarabe/journal/journaltoolbox.py:142
+ msgid "Since yesterday"
+-msgstr ""
++msgstr "Qaynamanta"
+ 
+ #  "Última semana"
+ #. TRANS: Filter entries modified during the last 7 days.
+ #: ../src/jarabe/journal/journaltoolbox.py:144
+ msgid "Past week"
+-msgstr ""
++msgstr "Ñawpaq semana"
+ 
+ #  "Último mes"
+ #. TRANS: Filter entries modified during the last 30 days.
+ #: ../src/jarabe/journal/journaltoolbox.py:146
+ msgid "Past month"
+-msgstr ""
++msgstr "Ñawpaq killa"
+ 
+ #  "Último año"
+ #. TRANS: Filter entries modified during the last 356 days.
+ #: ../src/jarabe/journal/journaltoolbox.py:148
+ msgid "Past year"
+-msgstr ""
++msgstr "Ñawpaq wata"
+ 
+ #  "Cualquiera"
+ #: ../src/jarabe/journal/journaltoolbox.py:155
+@@ -1607,12 +1610,13 @@ msgstr ""
+ #  "Mis amigos"
+ #: ../src/jarabe/journal/journaltoolbox.py:157
+ msgid "My friends"
+-msgstr ""
++msgstr "Masiykuna"
+ 
+ #  "Mi clase"
+ #: ../src/jarabe/journal/journaltoolbox.py:158
++#, fuzzy
+ msgid "My class"
+-msgstr ""
++msgstr "Clase nisqay"
+ 
+ #  "Cualquiera"
+ #: ../src/jarabe/journal/journaltoolbox.py:300
+@@ -1623,13 +1627,13 @@ msgstr ""
+ #: ../src/jarabe/journal/journaltoolbox.py:381
+ #: ../src/jarabe/journal/palettes.py:93
+ msgid "Copy to"
+-msgstr ""
++msgstr "Mayman kikinchay"
+ 
+ #  "Duplicar"
+ #: ../src/jarabe/journal/journaltoolbox.py:389
+ #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+ msgid "Duplicate"
+-msgstr ""
++msgstr "Kikinchay"
+ 
+ #  "Error mientras se copiaba la entrada. %s"
+ #: ../src/jarabe/journal/journaltoolbox.py:422
+@@ -1644,29 +1648,31 @@ msgstr ""
+ #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+ #: ../src/jarabe/journal/volumestoolbar.py:316
+ msgid "Error"
+-msgstr ""
++msgstr "Pantay"
+ 
+ #  "Iniciar"
+ #. TRANS: Action label for starting an entry.
+ #: ../src/jarabe/journal/journaltoolbox.py:497
+ #: ../src/jarabe/journal/palettes.py:74
+ msgid "Start"
+-msgstr ""
++msgstr "Qallariy"
+ 
+ #  "Ordenar por fecha de modificación"
+ #: ../src/jarabe/journal/journaltoolbox.py:525
++#, fuzzy
+ msgid "Sort by date modified"
+-msgstr ""
++msgstr "P'unchaywan siqichay"
+ 
+ #  "Ordenar por fecha de creación"
+ #: ../src/jarabe/journal/journaltoolbox.py:526
++#, fuzzy
+ msgid "Sort by date created"
+-msgstr ""
++msgstr "P'unchaywan siqichay"
+ 
+ #  "Ordenar por tamaño"
+ #: ../src/jarabe/journal/journaltoolbox.py:527
+ msgid "Sort by size"
+-msgstr ""
++msgstr "Sayayninwan siqichay"
+ 
+ #  "Ordenar vista"
+ #: ../src/jarabe/journal/journaltoolbox.py:536
+@@ -1676,17 +1682,17 @@ msgstr ""
+ #  "Su diario está vacío"
+ #: ../src/jarabe/journal/listview.py:316
+ msgid "Your Journal is empty"
+-msgstr ""
++msgstr "Diario nisqaykiqa chusaq kachkan  "
+ 
+ #  "Tu carpeta de documentos está vacía"
+ #: ../src/jarabe/journal/listview.py:319
+ msgid "Your documents folder is empty"
+-msgstr ""
++msgstr "Wayaqaykiqa chusaq kachkan "
+ 
+ #  "El dispositivo está vacío"
+ #: ../src/jarabe/journal/listview.py:321
+ msgid "The device is empty"
+-msgstr ""
++msgstr "Dispositivo nisqaqa chusaq kachkan"
+ 
+ #  "No hay entradas coincidentes"
+ #: ../src/jarabe/journal/listview.py:323
+@@ -1696,7 +1702,7 @@ msgstr ""
+ #  "Limpiar búsqueda"
+ #: ../src/jarabe/journal/listview.py:397
+ msgid "Clear search"
+-msgstr ""
++msgstr "Maskhanata pichay"
+ 
+ #  "Versión más antigua de la actividad %s"
+ #: ../src/jarabe/journal/misc.py:273
+@@ -1708,12 +1714,12 @@ msgstr ""
+ #: ../src/jarabe/journal/misc.py:274
+ #, python-format
+ msgid "Do you want to downgrade to version %s"
+-msgstr ""
++msgstr "Mawk'a %s churayta munankichu?"
+ 
+ #  "Su diario está lleno"
+ #: ../src/jarabe/journal/modalalert.py:64
+ msgid "Your Journal is full"
+-msgstr ""
++msgstr "Diario nisqaykiqa hunt'asqa"
+ 
+ #  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
+ #  "nuevas entradas."
+@@ -1724,28 +1730,28 @@ msgstr ""
+ #  "Mostrar diario"
+ #: ../src/jarabe/journal/modalalert.py:80
+ msgid "Show Journal"
+-msgstr ""
++msgstr "Diario nisqata rikhurichiy"
+ 
+ #  "Escoja un objeto"
+ #: ../src/jarabe/journal/objectchooser.py:146
+ msgid "Choose an object"
+-msgstr ""
++msgstr "Huk imata aqllay"
+ 
+ #  "Cerrar"
+ #: ../src/jarabe/journal/objectchooser.py:151
+ #: ../src/jarabe/view/viewsource.py:410
+ msgid "Close"
+-msgstr ""
++msgstr "Wisq'ay"
+ 
+ #  "Reiniciar con"
+ #: ../src/jarabe/journal/palettes.py:72
+ msgid "Resume with"
+-msgstr ""
++msgstr "Imawan hukmanta qallariy"
+ 
+ #  "Empezar con"
+ #: ../src/jarabe/journal/palettes.py:75
+ msgid "Start with"
+-msgstr ""
++msgstr "Imawan qallariy"
+ 
+ #  "No se encontró una actividad para iniciar la entrada"
+ #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
+@@ -1755,12 +1761,12 @@ msgstr ""
+ #  "Enviar a"
+ #: ../src/jarabe/journal/palettes.py:112
+ msgid "Send to"
+-msgstr ""
++msgstr "Piman apachiy"
+ 
+ #  "Ver detalles"
+ #: ../src/jarabe/journal/palettes.py:121
+ msgid "View Details"
+-msgstr ""
++msgstr "Aswan qhaway"
+ 
+ #  "Las entradas sin un archivo no pueden ser enviadas."
+ #: ../src/jarabe/journal/palettes.py:160
+@@ -1776,17 +1782,17 @@ msgstr ""
+ #  "Portapapeles"
+ #: ../src/jarabe/journal/palettes.py:267
+ msgid "Clipboard"
+-msgstr ""
++msgstr "Laphikunata apaq"
+ 
+ #  "No hay amigos presentes"
+ #: ../src/jarabe/journal/palettes.py:322
+ msgid "No friends present"
+-msgstr ""
++msgstr "Mana masikunaqa kankuchu"
+ 
+ #  "No se encontró una conexión válida"
+ #: ../src/jarabe/journal/palettes.py:327
+ msgid "No valid connection found"
+-msgstr ""
++msgstr "Mana allin t'inkinata maskhasqachu"
+ 
+ #  "No se encontró una actividad para retomar la entrada"
+ #: ../src/jarabe/journal/palettes.py:355
+@@ -1796,7 +1802,7 @@ msgstr ""
+ #  "Documentos"
+ #: ../src/jarabe/journal/volumestoolbar.py:209
+ msgid "Documents"
+-msgstr ""
++msgstr "Qillqa q'ipikuna"
+ 
+ #  "%(free_space)d MB libres"
+ #: ../src/jarabe/journal/volumestoolbar.py:391
+@@ -1840,7 +1846,7 @@ 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 ""
++msgstr "IP kamachinaqa mana allinñachu"
+ 
+ #  "Claves requeridas, pero no fueron suministradas."
+ #: ../src/jarabe/model/network.py:178
+@@ -1877,8 +1883,9 @@ msgstr ""
+ 
+ #  "El servicio PPP se ha desconectado inesperadamente."
+ #: ../src/jarabe/model/network.py:191
++#, fuzzy
+ msgid "The PPP service disconnected unexpectedly."
+-msgstr ""
++msgstr "Servicio PPP t'aqaran."
+ 
+ #  "El servicio PPP ha abandonado o fallado inesperadamente."
+ #: ../src/jarabe/model/network.py:193
+@@ -1948,7 +1955,7 @@ msgstr ""
+ #  "Llamada falló."
+ #: ../src/jarabe/model/network.py:220
+ msgid "Dialing failed."
+-msgstr ""
++msgstr "Waqyanaqa pantaran"
+ 
+ #  "Fallo en inicialización de modem."
+ #: ../src/jarabe/model/network.py:222
+@@ -2018,12 +2025,12 @@ msgstr ""
+ #  "Remover amigo"
+ #: ../src/jarabe/view/buddymenu.py:67
+ msgid "Remove friend"
+-msgstr ""
++msgstr "Masita chinkachiy"
+ 
+ #  "Agregar amigo"
+ #: ../src/jarabe/view/buddymenu.py:70
+ msgid "Make friend"
+-msgstr ""
++msgstr "Masita yapay"
+ 
+ #  "Apagar"
+ #: ../src/jarabe/view/buddymenu.py:87
+@@ -2033,65 +2040,65 @@ msgstr ""
+ #  "Reiniciar"
+ #: ../src/jarabe/view/buddymenu.py:95
+ msgid "Restart"
+-msgstr ""
++msgstr "Hukmanta qallariy"
+ 
+ #  "Salir"
+ #: ../src/jarabe/view/buddymenu.py:101
+ msgid "Logout"
+-msgstr ""
++msgstr "Lluqsiy"
+ 
+ #  "Mis ajustes"
+ #: ../src/jarabe/view/buddymenu.py:106
+ msgid "My Settings"
+-msgstr ""
++msgstr "Aqllasqaykuna"
+ 
+ #  "Invitar a %s"
+ #: ../src/jarabe/view/buddymenu.py:142
+-#, python-format
++#, python-format, fuzzy
+ msgid "Invite to %s"
+-msgstr ""
++msgstr "%sman mink'ay"
+ 
+ #  "<b>%s</b> falló al iniciar."
+ #: ../src/jarabe/view/launcher.py:145
+ #, python-format
+ msgid "<b>%s</b> failed to start."
+-msgstr ""
++msgstr "<b>%s</b> qallarispa pantaran."
+ 
+ #  "Iniciando..."
+ #: ../src/jarabe/view/palettes.py:48
+ msgid "Starting..."
+-msgstr ""
++msgstr "Qallarichkan..."
+ 
+ #  "Actividad falló al iniciar"
+ #: ../src/jarabe/view/palettes.py:58
+ msgid "Activity failed to start"
+-msgstr ""
++msgstr "Ruwanaqa qallarispa pantaran."
+ 
+ #  "Ver fuente"
+ #. TODO: share-with, keep
+ #: ../src/jarabe/view/palettes.py:91
+ msgid "View Source"
+-msgstr ""
++msgstr "Chimputa qhaway"
+ 
+ #  "Parar"
+ #: ../src/jarabe/view/palettes.py:102
+ msgid "Stop"
+-msgstr ""
++msgstr "Sayachiy"
+ 
+ #  "Empezar nuevo"
+ #: ../src/jarabe/view/palettes.py:139
+ msgid "Start new"
+-msgstr ""
++msgstr "Musuqta qallariy"
+ 
+ #  "Mostrar contenidos"
+ #: ../src/jarabe/view/palettes.py:180
+ msgid "Show contents"
+-msgstr ""
++msgstr "Ukhunpi qhaway"
+ 
+ #  "Eliminar"
+ #: ../src/jarabe/view/palettes.py:229
+ msgid "Remove"
+-msgstr ""
++msgstr "Qhichuy"
+ 
+ #  "Fuente de la instancia"
+ #: ../src/jarabe/view/viewsource.py:263
+@@ -2100,8 +2107,9 @@ msgstr ""
+ 
+ #  "Fuente"
+ #: ../src/jarabe/view/viewsource.py:312
++#, fuzzy
+ msgid "Source"
+-msgstr ""
++msgstr "Pukyu"
+ 
+ #  "Fuente del paquete de la actividad"
+ #: ../src/jarabe/view/viewsource.py:374
+@@ -2117,9 +2125,9 @@ msgstr ""
+ #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+ #, python-format
+ msgid "View source: %r"
+-msgstr ""
++msgstr "Qhaway chimputa: %r"
+ 
+ #  "Sugar en una ventana"
+ #: ../src/jarabe/util/emulator.py:40
+ msgid "Sugar in a window"
+-msgstr ""
++msgstr "Juk qhawanapi Azucar"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0005-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0005-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..04b155e
--- /dev/null
+++ b/rpms/sugar/0005-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,2281 @@
+From 5882cbad10552e6e97858287f8fa89377c897035 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 23 Nov 2011 07:44:44 +0200
+Subject: [PATCH sugar 05/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 95 of 379 messages translated (5
+ fuzzy).
+
+---
+ po/aym.po |  684 +++++++++++++++----------------------------------------------
+ 1 files changed, 165 insertions(+), 519 deletions(-)
+
+diff --git a/po/aym.po b/po/aym.po
+index 94a2580..9fbe07e 100644
+--- a/po/aym.po
++++ b/po/aym.po
+@@ -1,9 +1,13 @@
++# 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-02 04:26+0200\n"
++"POT-Creation-Date: 2011-10-20 00:32-0400\n"
++"PO-Revision-Date: 2011-11-23 07:42+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: aym\n"
+@@ -16,202 +20,199 @@ msgstr ""
+ #  "Acerca de mí"
+ #: ../extensions/cpsection/aboutme/__init__.py:24
+ msgid "About Me"
+-msgstr "nayatanayxata"
++msgstr "Luräwinakajata"
+ 
+ #  "Debe ingresar un nombre."
+ #: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr "sutiwa mantañapaxa"
++msgstr "Maya sutimpi chimpt'ma."
+ 
+ #  "borde:   color=%s tonalidad=%s"
+ #: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+ msgid "stroke:   color=%s hue=%s"
+-msgstr ""
++msgstr "%s=sami  %s=samichajata: qawaya"
+ 
+ #  "borde:   %s"
+ #: ../extensions/cpsection/aboutme/model.py:78
+ #, python-format
+ msgid "stroke:   %s"
+-msgstr "qawaya   %s"
++msgstr "...... %s qawaya"
+ 
+ #  "relleno:     color=%s tonalidad=%s"
+ #: ../extensions/cpsection/aboutme/model.py:80
+ #, python-format
+ msgid "fill:     color=%s hue=%s"
+-msgstr ""
++msgstr "%s=sami %s=samichjata: phuqachata"
+ 
+ #  "relleno:     %s"
+ #: ../extensions/cpsection/aboutme/model.py:82
+ #, python-format
+ msgid "fill:     %s"
+-msgstr "phuqa     %s"
++msgstr "%s     : phuqachata"
+ 
+ #  "Error en modificadores de color especificados."
+ #: ../extensions/cpsection/aboutme/model.py:94
+ msgid "Error in specified color modifiers."
+-msgstr ""
++msgstr "Samichatanaka chiqachäwi pantjasa phuqachata."
+ 
+ #  "Error en colores especificados."
+ #: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+-msgstr ""
++msgstr "Samichatanaka pantjasa phuqachata."
+ 
+ #  "Clic para cambiar su color:"
+ #: ../extensions/cpsection/aboutme/view.py:235
+ msgid "Click to change your color:"
+-msgstr ""
++msgstr "Samichata mayjt'ayañataki q'upt'ma:"
+ 
+ #  "Acerca de mi computadora"
+ #: ../extensions/cpsection/aboutcomputer/__init__.py:21
+ msgid "About my Computer"
+-msgstr ""
++msgstr "Kumputaruraja tuqita"
+ 
+ #  "No disponible"
+-#: ../extensions/cpsection/aboutcomputer/model.py:42
++#: ../extensions/cpsection/aboutcomputer/model.py:43
+ msgid "Not available"
+-msgstr ""
++msgstr "jani wakisiri"
+ 
+ #  "%(interface)s: %(version)s"
+-#: ../extensions/cpsection/aboutcomputer/model.py:171
++#: ../extensions/cpsection/aboutcomputer/model.py:183
+ #, python-format
+ msgid "%(interface)s: %(version)s"
+ msgstr "%(interface)s: %(version)s"
+ 
+ #  "Identidad"
+-#: ../extensions/cpsection/aboutcomputer/view.py:61
++#: ../extensions/cpsection/aboutcomputer/view.py:59
+ msgid "Identity"
+-msgstr ""
++msgstr "Kankaña"
+ 
+ #  "Número de serie:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:70
++#: ../extensions/cpsection/aboutcomputer/view.py:68
+ msgid "Serial Number:"
+-msgstr ""
++msgstr "Jakhu chimpu:"
+ 
+ #  "Software"
+-#: ../extensions/cpsection/aboutcomputer/view.py:92
++#: ../extensions/cpsection/aboutcomputer/view.py:90
+ msgid "Software"
+-msgstr ""
++msgstr "Wakichäwi"
+ 
+ #  "Ensamble:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:101
++#: ../extensions/cpsection/aboutcomputer/view.py:99
+ msgid "Build:"
+-msgstr ""
++msgstr "Apthapiña:"
+ 
+ #  "Azúcar:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:116
++#: ../extensions/cpsection/aboutcomputer/view.py:114
+ msgid "Sugar:"
+-msgstr ""
++msgstr "Misk'i:"
+ 
+ #  "Firmware:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:132
++#: ../extensions/cpsection/aboutcomputer/view.py:129
+ msgid "Firmware:"
+-msgstr ""
++msgstr "Firmware:"
+ 
+ #  "Firmware de la red inalámbrica:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:147
++#: ../extensions/cpsection/aboutcomputer/view.py:144
+ msgid "Wireless Firmware:"
+-msgstr ""
++msgstr "Red inalámbrica wakisiri Firmware:"
+ 
+ #  "Licencia y derechos de autor"
+-#: ../extensions/cpsection/aboutcomputer/view.py:170
++#: ../extensions/cpsection/aboutcomputer/view.py:167
+ msgid "Copyright and License"
+-msgstr ""
++msgstr "Wakichirina wakisiripa"
+ 
+-#  "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
++#: ../extensions/cpsection/aboutcomputer/view.py:185
+ 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 wakichäwixa jumataki uchatawa. Sugar sata software wakichäwixa "
++"taqitakiwa, ukaxa GNU kamachinakana qhananchasi, ukata maynita mayniru "
++"t'uqiyañawa wakisi."
+ 
+ #  "Licencia completa:"
+-#: ../extensions/cpsection/aboutcomputer/view.py:200
++#: ../extensions/cpsection/aboutcomputer/view.py:197
+ msgid "Full license:"
+-msgstr ""
++msgstr "Taqi wakisiri:"
+ 
+ #  "Fecha y hora"
+ #: ../extensions/cpsection/datetime/__init__.py:21
+ msgid "Date & Time"
+-msgstr ""
++msgstr "Urumpi urasampi"
+ 
+ #  "Error, zona horaria no existe."
+ #: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+-msgstr ""
++msgstr "Pantjasiwa, pacha chinuwa chhaqi."
+ 
+ #  "Zona horaria"
+ #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+-msgstr ""
++msgstr "Pacha chinu suyu"
+ 
+ #  "Cuadro"
+ #: ../extensions/cpsection/frame/__init__.py:21
+ msgid "Frame"
+-msgstr ""
++msgstr "Wakichata"
+ 
+ #  "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 ""
++msgstr "Chanipaxa parisa jakhuñapawa."
+ 
+ #  "nunca"
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr ""
++msgstr "Janipuniwa"
+ 
+ #  "instantáneo"
+ #: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+-msgstr ""
++msgstr "Mäpita"
+ 
+-#  "%s segundos"
+ #: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+ msgid "%s seconds"
+-msgstr ""
++msgstr "%s pacha ch'ich'inaka"
+ 
+ #  "Retraso de activación"
+ #: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+-msgstr ""
++msgstr "Qhantayaña qhipartayäwi"
+ 
+ #  "Esquina"
+ #: ../extensions/cpsection/frame/view.py:78
+ msgid "Corner"
+-msgstr ""
++msgstr "K'uchu"
+ 
+ #  "Borde"
+ #: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+-msgstr ""
++msgstr "Qawaya"
+ 
+ #  "Teclado"
+ #: ../extensions/cpsection/keyboard/__init__.py:21
+ #: ../extensions/cpsection/keyboard/view.py:32
+ msgid "Keyboard"
+-msgstr ""
++msgstr "Qillqa q'upt'aña"
+ 
+ #  "Modelo de teclado"
+ #: ../extensions/cpsection/keyboard/view.py:190
+ msgid "Keyboard Model"
+-msgstr ""
++msgstr "Kasta qillqaña"
+ 
+ #  "Tecla(s) para cambiar el diseño"
+ #: ../extensions/cpsection/keyboard/view.py:250
+ msgid "Key(s) to change layout"
+-msgstr ""
++msgstr "Wakichatanaka mayjt'ayaña q'upt'aña"
+ 
+-#  "Diseño(s) de teclado"
+ #: ../extensions/cpsection/keyboard/view.py:319
+ msgid "Keyboard Layout(s)"
+-msgstr ""
++msgstr "Qillqaña yänaka"
+ 
+ #  "Idioma"
+ #: ../extensions/cpsection/language/__init__.py:21
+@@ -219,299 +220,248 @@ msgstr ""
+ 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 ""
++msgstr "Janiwa wakisiti ~/.i18n. Taqina mantañapataki wakichata."
+ 
+-#  "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 ""
++msgstr "código=%s aruxa janiwa amuyasiti."
+ 
+-#  "Lo siento, yo no hablo '%s'."
+ #: ../extensions/cpsection/language/model.py:152
+ #, python-format
+ msgid "Sorry I do not speak '%s'."
+-msgstr ""
++msgstr "Jichhasti, janiwa yatkti '%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
+ msgid ""
+ "Add languages in the order you prefer. If a translation is not available, "
+ "the next in the list will be used."
+ msgstr ""
++"Arunaka wakisipanjama siqintma. Aru chanipa jani utjipana, siqina arkiri "
++"aruwa chhijllasini."
+ 
+-#  "Configuración del módem"
+ #: ../extensions/cpsection/modemconfiguration/__init__.py:21
+ msgid "Modem Configuration"
+-msgstr ""
++msgstr "módem wakichäwi wakichaña"
+ 
+-#  "Nombre de usuario:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:94
+ msgid "Username:"
+-msgstr ""
++msgstr "Apnaqirini sutipa:"
+ 
+-#  "Contraseña:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:106
+ msgid "Password:"
+-msgstr ""
++msgstr "Jist'araña:"
+ 
+-#  "Número:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:118
+ msgid "Number:"
+-msgstr ""
++msgstr "Jakhu:"
+ 
+-#  "Nombre de punto de acceso (APN):"
+ #: ../extensions/cpsection/modemconfiguration/view.py:130
+ msgid "Access Point Name (APN):"
+-msgstr ""
++msgstr "Qhantayaña chiqana sutipa (APN):"
+ 
+-#  "Número de identificación personal (PIN):"
+ #: ../extensions/cpsection/modemconfiguration/view.py:142
+ msgid "Personal Identity Number (PIN):"
+-msgstr ""
++msgstr "Sapa mayni chimpupa jakhu (PIN):"
+ 
+-#  "Clave personal de desbloqueo (PUK):"
+ #: ../extensions/cpsection/modemconfiguration/view.py:154
+ msgid "Personal Unblocking Key (PUK):"
+-msgstr ""
++msgstr "Qhantayaña sayt'ayata jist'araña (PUK):"
+ 
+-#  "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 ""
++"(3G) telefonía celular wakichäwinakaparu mantañatakixa akïri yatiyañanakawa "
++"wakisi."
+ 
+-#  "Red"
+ #: ../extensions/cpsection/network/__init__.py:21
+ #: ../extensions/cpsection/network/view.py:29
+ msgid "Network"
+-msgstr ""
++msgstr "Mayachasïwi"
+ 
+-#  "Estado desconocido."
+ #: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+-msgstr ""
++msgstr "Jani yatita kankaña."
+ 
+-#  "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 ""
++msgstr "Pantjatawa, rayru qhantayañatakixa akïri limt'ma on/off."
+ 
+-#  "Error en argumento especificado use 0/1."
+ #: ../extensions/cpsection/network/model.py:140
+ msgid "Error in specified argument use 0/1."
+-msgstr ""
++msgstr "Panjatawa, wakisiriru katusa limt'ma 0/1."
+ 
+-#  "Inalámbrica"
+ #: ../extensions/cpsection/network/view.py:61
+ msgid "Wireless"
+-msgstr ""
++msgstr "Wayra taypita"
+ 
+-#  "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 ""
++msgstr "Wayra raryu jiwasa qhanayaña jakañapa ch'amanchañataki"
+ 
+-#  "Radio"
+ #: ../extensions/cpsection/network/view.py:82
+ msgid "Radio"
+-msgstr ""
++msgstr "Raryu"
+ 
+-#  "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 ""
++msgstr "Pantjata mistupana, mayachasïwi sartäwinaka amuyañäni"
+ 
+-#  "Descarte historial de la red"
+ #: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+-msgstr ""
++msgstr "Mayachasiña saräwinaka qhananchma"
+ 
+-#  "Colaboración"
+ #: ../extensions/cpsection/network/view.py:122
+ msgid "Collaboration"
+-msgstr ""
++msgstr "Yanapaña"
+ 
+-#  "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 ""
++"Katuqirixa mayachasiña irptiri utankiwa; ukana taqina mayachasisa "
++"yanapasipxi, qawata mayaru tukupxi."
+ 
+-#  "Servidor:"
+ #: ../extensions/cpsection/network/view.py:140
+ msgid "Server:"
+-msgstr ""
++msgstr "katuqiri"
+ 
+-#  "Energía"
+ #: ../extensions/cpsection/power/__init__.py:21
+ msgid "Power"
+-msgstr ""
++msgstr "Ch'ama"
+ 
+-#  "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 ""
++msgstr "Pantjata automatic pm amuyt'awipa janiwa/jisa"
+ 
+-#  "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 ""
++msgstr "Pantjata extreme pm amuyt'awipa janiwa/jisa"
+ 
+-#  "Manejo de energía"
+ #: ../extensions/cpsection/power/view.py:48
+ msgid "Power management"
+-msgstr ""
++msgstr "ch'amana apnaqawipa"
+ 
+-#  "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 ""
++msgstr "kipqaki ch'ama apnaqawipa (batteria jaya jaqañataqi)"
+ 
+-#  "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 ""
++msgstr "Wali ch'ama apnaqawipa (radio apaqaña, batteria jaya jaqaña)"
+ 
+-#  "Actualización de software"
+ #: ../extensions/cpsection/updater/__init__.py:21
+ msgid "Software update"
+-msgstr ""
++msgstr "amuyt'awi machaqaptayana"
+ 
+-#  "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 ""
++"amuyt'awi machaqaptayañanaka pantjatanaka askichaña, pantjatanaka jarqayaña, "
++"machaq amuyt'awinaka"
+ 
+-#  "Probando %s..."
+ #: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+ msgid "Checking %s..."
+-msgstr ""
++msgstr "yant'aski %s..."
+ 
+-#  "Descargando %s..."
+ #: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+ msgid "Downloading %s..."
+-msgstr ""
++msgstr "q'ipiraski %s..."
+ 
+-#  "Actualizando %s..."
+ #: ../extensions/cpsection/updater/view.py:129
+-#, python-format
++#, python-format, fuzzy
+ msgid "Updating %s..."
+-msgstr ""
++msgstr "mayampi qalltayaski %s..."
+ 
+-#  "Tu software esta actualizado"
+ #: ../extensions/cpsection/updater/view.py:139
+ msgid "Your software is up-to-date"
+-msgstr ""
++msgstr "amuyt'awimaxa machaqaptayatawa"
+ 
+-#  "Puedes instalar %s actualización"
+-#  "Puedes instalar %s actualizaciones"
+ #: ../extensions/cpsection/updater/view.py:141
+-#, python-format
++#, python-format, fuzzy
+ msgid "You can install %s update"
+ msgid_plural "You can install %s updates"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "uchantaña qalltasmawa machaqachaña"
++msgstr[1] "uchantaña qalltasmawa machaqachañanaka"
+ 
+-#  "Buscando actualizaciones..."
+ #: ../extensions/cpsection/updater/view.py:159
+ msgid "Checking for updates..."
+-msgstr ""
++msgstr "machaqaptayañanaka thaqaski"
+ 
+-#  "Instalando actualizaciones..."
+ #: ../extensions/cpsection/updater/view.py:164
+ msgid "Installing updates..."
+-msgstr ""
++msgstr "machaqaptayaña ut'ayaski"
+ 
+-#  "%s actualización fue instalada"
+-#  "%s actualizaciones fueron instaladas"
+ #: ../extensions/cpsection/updater/view.py:173
+-#, python-format
++#, python-format, fuzzy
+ msgid "%s update was installed"
+ msgid_plural "%s updates were installed"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%s machaqatawi uchatawxiwa"
++msgstr[1] "%s machaqatawinakaxa uchatawxiwa"
+ 
+-#  "Instalación seleccionada"
+ #: ../extensions/cpsection/updater/view.py:255
+ msgid "Install selected"
+-msgstr ""
++msgstr "machaqaptayaña ajllitaxiwa"
+ 
+-#  "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 ""
++msgstr "ni maya"
+ 
+-#  "1 KB"
+ #. TRANS: download size of very small updates
+ #: ../extensions/cpsection/updater/view.py:385
+ msgid "1 KB"
+-msgstr ""
++msgstr "maya kb"
+ 
+-#  "%.0f KB"
+ #. TRANS: download size of small updates, e.g. '250 KB'
+ #: ../extensions/cpsection/updater/view.py:388
+ #, python-format
+ msgid "%.0f KB"
+-msgstr ""
++msgstr "%.0f kb"
+ 
+-#  "%.1f MB"
+ #. TRANS: download size of updates, e.g. '2.3 MB'
+ #: ../extensions/cpsection/updater/view.py:391
+ #, python-format
+ msgid "%.1f MB"
+-msgstr ""
++msgstr "%.1f mb"
+ 
+-#  "Mi batería"
+ #: ../extensions/deviceicon/battery.py:71
+ msgid "My Battery"
+-msgstr ""
++msgstr "nayana watiriyaja"
+ 
+-#  "Eliminado"
+ #: ../extensions/deviceicon/battery.py:147
+ msgid "Removed"
+-msgstr ""
++msgstr "apsuta"
+ 
+-#  "Cargando"
+ #: ../extensions/deviceicon/battery.py:150
+ msgid "Charging"
+-msgstr ""
++msgstr "Ch'ama uchaskiwa"
+ 
+-#  "Queda muy poca batería"
+ #: ../extensions/deviceicon/battery.py:153
+ msgid "Very little power remaining"
+-msgstr ""
++msgstr "pisi ch'amanikxiwa watiriyaxa"
+ 
+-#  "Quedan %(hour)d:%(min).2d"
+ #: ../extensions/deviceicon/battery.py:158
+ #, python-format
+ msgid "%(hour)d:%(min).2d remaining"
+@@ -520,84 +470,71 @@ msgstr ""
+ #  "Cargada"
+ #: ../extensions/deviceicon/battery.py:161
+ msgid "Charged"
+-msgstr "q'ipxaruta "
++msgstr "q'ipxaruta"
+ 
+-#  "Direccion IP: %s"
+ #: ../extensions/deviceicon/network.py:49
+ #, python-format
+ msgid "IP address: %s"
+-msgstr ""
++msgstr "thaki katjawi IP: %s"
+ 
+-#  "Desconectar"
+ #: ../extensions/deviceicon/network.py:104
+ #: ../extensions/deviceicon/network.py:303
+ #: ../src/jarabe/desktop/networkviews.py:140
+-#: ../src/jarabe/desktop/networkviews.py:508
++#: ../src/jarabe/desktop/networkviews.py:509
+ msgid "Disconnect"
+-msgstr ""
++msgstr "jaljtayaña"
+ 
+-#  "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
++#: ../src/jarabe/desktop/networkviews.py:244
++#: ../src/jarabe/desktop/networkviews.py:548
++#: ../src/jarabe/desktop/networkviews.py:683
+ msgid "Connecting..."
+-msgstr ""
++msgstr "Mayachasa"
+ 
+-#  "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
++#: ../src/jarabe/desktop/networkviews.py:254
++#: ../src/jarabe/desktop/networkviews.py:554
++#: ../src/jarabe/desktop/networkviews.py:689
+ msgid "Connected"
+-msgstr ""
++msgstr "Mayachata"
+ 
+-#  "No hay conexión inalámbrica"
+ #: ../extensions/deviceicon/network.py:130
+ msgid "No wireless connection"
+-msgstr ""
++msgstr "Jani mayachaña utjiti"
+ 
+-#  "Canal"
+ #: ../extensions/deviceicon/network.py:144
+ msgid "Channel"
+-msgstr ""
++msgstr "thaki"
+ 
+-#  "Red Cableada"
+ #: ../extensions/deviceicon/network.py:159
+ msgid "Wired Network"
+-msgstr ""
++msgstr "Chinu taypit mayachasiña"
+ 
+-#  "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
++#: ../src/jarabe/desktop/networkviews.py:505
++#: ../src/jarabe/desktop/networkviews.py:639
+ 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
+@@ -607,167 +544,134 @@ msgstr ""
+ 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 "
+@@ -775,147 +679,116 @@ msgid ""
+ "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 "
+@@ -923,155 +796,124 @@ msgid ""
+ "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"
++# "Modelo de teclado"
+ #: ../data/sugar.schemas.in.h:36
++#, fuzzy
+ msgid "Keyboard model"
+-msgstr ""
++msgstr "Kasta qillqaña"
+ 
+-#  "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 ""
+@@ -1079,28 +921,16 @@ msgid ""
+ "%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
+@@ -1117,62 +947,51 @@ msgid ""
+ "    "
+ 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?"
+@@ -1185,287 +1004,236 @@ msgstr ""
+ 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/journaltoolbox.py:413
+ #: ../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/journaltoolbox.py:509
+ #: ../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
++#: ../src/jarabe/desktop/networkviews.py:501
+ #, python-format
+ msgid "Ad-hoc Network %d"
+ msgstr ""
+ 
+-#  "Red Malla %d"
+-#: ../src/jarabe/desktop/networkviews.py:634
++#: ../src/jarabe/desktop/networkviews.py:636
+ #, 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
++msgctxt "Clipboard"
+ 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 ""
+@@ -1475,647 +1243,525 @@ msgstr ""
+ msgid "Name:"
+ msgstr "Suti:"
+ 
+-#  "Clic para cambiar de color:"
++# "Clic para cambiar su color:"
+ #: ../src/jarabe/intro/window.py:126
++#, fuzzy
+ msgid "Click to change color:"
+-msgstr ""
++msgstr "Samichata mayjt'ayañataki q'upt'ma:"
+ 
+-#  "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/journaltoolbox.py:468
+ #: ../src/jarabe/journal/palettes.py:198
+ #: ../src/jarabe/journal/volumestoolbar.py:368
+ msgid "Journal"
+ msgstr ""
+ 
+-#  "Buscar"
+-#: ../src/jarabe/journal/journaltoolbox.py:71
++#: ../src/jarabe/journal/journaltoolbox.py:72
+ msgid "Search"
+ msgstr ""
+ 
+-#  "Cualquier momento"
+-#: ../src/jarabe/journal/journaltoolbox.py:138
++#: ../src/jarabe/journal/journaltoolbox.py:139
+ msgid "Anytime"
+ msgstr ""
+ 
+-#  "Hoy"
+-#: ../src/jarabe/journal/journaltoolbox.py:140
++#: ../src/jarabe/journal/journaltoolbox.py:141
+ msgid "Today"
+ msgstr ""
+ 
+-#  "Desde ayer"
+-#: ../src/jarabe/journal/journaltoolbox.py:142
++#: ../src/jarabe/journal/journaltoolbox.py:143
+ msgid "Since yesterday"
+ msgstr ""
+ 
+-#  "Última semana"
+ #. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:144
++#: ../src/jarabe/journal/journaltoolbox.py:145
+ msgid "Past week"
+ msgstr ""
+ 
+-#  "Último mes"
+ #. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:146
++#: ../src/jarabe/journal/journaltoolbox.py:147
+ msgid "Past month"
+ msgstr ""
+ 
+-#  "Último año"
+ #. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:148
++#: ../src/jarabe/journal/journaltoolbox.py:149
+ msgid "Past year"
+ msgstr ""
+ 
+-#  "Cualquiera"
+-#: ../src/jarabe/journal/journaltoolbox.py:155
++#: ../src/jarabe/journal/journaltoolbox.py:156
+ msgid "Anyone"
+ msgstr ""
+ 
+-#  "Mis amigos"
+-#: ../src/jarabe/journal/journaltoolbox.py:157
++#: ../src/jarabe/journal/journaltoolbox.py:158
+ msgid "My friends"
+ msgstr ""
+ 
+-#  "Mi clase"
+-#: ../src/jarabe/journal/journaltoolbox.py:158
++#: ../src/jarabe/journal/journaltoolbox.py:159
+ msgid "My class"
+ msgstr ""
+ 
+-#  "Cualquiera"
+-#: ../src/jarabe/journal/journaltoolbox.py:300
++#: ../src/jarabe/journal/journaltoolbox.py:301
+ msgid "Anything"
+ msgstr ""
+ 
+-#  "Copiar a"
+-#: ../src/jarabe/journal/journaltoolbox.py:381
++#: ../src/jarabe/journal/journaltoolbox.py:396
+ #: ../src/jarabe/journal/palettes.py:93
+ msgid "Copy to"
+ msgstr ""
+ 
+-#  "Duplicar"
+-#: ../src/jarabe/journal/journaltoolbox.py:389
++#: ../src/jarabe/journal/journaltoolbox.py:404
+ #: ../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/journaltoolbox.py:437
+ #: ../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/journaltoolbox.py:438
+ #: ../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/journaltoolbox.py:512
+ #: ../src/jarabe/journal/palettes.py:74
+ msgid "Start"
+ msgstr ""
+ 
+-#  "Ordenar por fecha de modificación"
+-#: ../src/jarabe/journal/journaltoolbox.py:525
++#: ../src/jarabe/journal/journaltoolbox.py:540
+ msgid "Sort by date modified"
+ msgstr ""
+ 
+-#  "Ordenar por fecha de creación"
+-#: ../src/jarabe/journal/journaltoolbox.py:526
++#: ../src/jarabe/journal/journaltoolbox.py:541
+ msgid "Sort by date created"
+ msgstr ""
+ 
+-#  "Ordenar por tamaño"
+-#: ../src/jarabe/journal/journaltoolbox.py:527
++#: ../src/jarabe/journal/journaltoolbox.py:542
+ msgid "Sort by size"
+ msgstr ""
+ 
+-#  "Ordenar vista"
+-#: ../src/jarabe/journal/journaltoolbox.py:536
++#: ../src/jarabe/journal/journaltoolbox.py:551
+ 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
++msgctxt "Volume"
+ 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 ""
++msgstr "Mis'ki wakichawi"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0006-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0006-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..b8eff3d
--- /dev/null
+++ b/rpms/sugar/0006-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,218 @@
+From d8a572d57a751b42fcd0b31e112f4ebc5243bbd3 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 23 Nov 2011 16:11:08 +0200
+Subject: [PATCH sugar 06/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 202 of 379 messages translated (15
+ fuzzy).
+
+---
+ po/quz.po |   46 +++++++++++++++++++++++-----------------------
+ 1 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/po/quz.po b/po/quz.po
+index 8ef1d33..3e3a080 100644
+--- a/po/quz.po
++++ b/po/quz.po
+@@ -4,7 +4,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-11-20 01:55+0200\n"
++"PO-Revision-Date: 2011-11-23 16:10+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: Runasimipi.org\n"
+ "Language: quz\n"
+@@ -34,7 +34,7 @@ msgstr "muyunkuna:   lipi=%s tonalidad=%s"
+ #: ../extensions/cpsection/aboutme/model.py:78
+ #, python-format
+ msgid "stroke:   %s"
+-msgstr "muyunkuna: %s"
++msgstr "muyunkuna:   %s"
+ 
+ #  "relleno:     color=%s tonalidad=%s"
+ #: ../extensions/cpsection/aboutme/model.py:80
+@@ -46,7 +46,7 @@ msgstr "hunt'ana:     llimp'i=%s tonalidad=%s\""
+ #: ../extensions/cpsection/aboutme/model.py:82
+ #, python-format
+ msgid "fill:     %s"
+-msgstr "hunt'ana:  %s"
++msgstr "hunt'ana:     %s"
+ 
+ #  "Error en modificadores de color especificados."
+ #: ../extensions/cpsection/aboutme/model.py:94
+@@ -56,7 +56,7 @@ msgstr "Pantay aqllasqa llimp'ikunapi."
+ #  "Error en colores especificados."
+ #: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+-msgstr "Pantay aqllasqa llimp'ikunapi"
++msgstr "Pantay aqllasqa llimp'ikunapi."
+ 
+ #  "Clic para cambiar su color:"
+ #: ../extensions/cpsection/aboutme/view.py:235
+@@ -103,7 +103,7 @@ msgstr "Ruwasqa kuti:"
+ #  "Azúcar:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:116
+ msgid "Sugar:"
+-msgstr "Misk'i"
++msgstr "Misk'i:"
+ 
+ #  "Firmware:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:132
+@@ -113,7 +113,7 @@ msgstr "Firmware:"
+ #  "Firmware de la red inalámbrica:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:147
+ msgid "Wireless Firmware:"
+-msgstr "Firmware jila llika inala"
++msgstr "Firmware jila llika inala:"
+ 
+ #  "Licencia y derechos de autor"
+ #: ../extensions/cpsection/aboutcomputer/view.py:170
+@@ -135,7 +135,7 @@ msgstr ""
+ #  "Licencia completa:"
+ #: ../extensions/cpsection/aboutcomputer/view.py:200
+ msgid "Full license:"
+-msgstr "Lli'punte mañakuy"
++msgstr "Lli'punte mañakuy:"
+ 
+ #  "Fecha y hora"
+ #: ../extensions/cpsection/datetime/__init__.py:21
+@@ -163,7 +163,7 @@ msgstr "Muyuykunapi"
+ #: ../extensions/cpsection/frame/model.py:41
+ #: ../extensions/cpsection/frame/model.py:66
+ msgid "Value must be an integer."
+-msgstr "Tukuy kanan huk llipin yupana"
++msgstr "Tukuy kanan huk llipin yupana."
+ 
+ #  "nunca"
+ #: ../extensions/cpsection/frame/view.py:27
+@@ -217,7 +217,7 @@ msgstr "Ñit'ina wakpaq ñit'ina(kuna)"
+ #: ../extensions/cpsection/keyboard/view.py:319
+ #, fuzzy
+ msgid "Keyboard Layout(s)"
+-msgstr "Ñit'ina chhalay"
++msgstr "Ñit'ina(kuna) chhalay"
+ 
+ #  "Idioma"
+ #: ../extensions/cpsection/language/__init__.py:21
+@@ -229,13 +229,13 @@ msgstr "Simi"
+ #: ../extensions/cpsection/language/model.py:30
+ #, fuzzy
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "Mana \"~/.i18n\"pi yaykuyta atikunchu.   "
++msgstr "Mana \"~/.i18n\"pi yaykuyta atikunchu."
+ 
+ #  "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 "Chimpu=%s, chay simi mana riqsisqachu.  "
++msgstr "Chimpu=%s, chay simi mana riqsisqachu."
+ 
+ #  "Lo siento, yo no hablo '%s'."
+ #: ../extensions/cpsection/language/model.py:152
+@@ -265,7 +265,7 @@ msgstr "Runa suti:"
+ #  "Contraseña:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:106
+ msgid "Password:"
+-msgstr "Pakasqa simi"
++msgstr "Pakasqa simi:"
+ 
+ #  "Número:"
+ #: ../extensions/cpsection/modemconfiguration/view.py:118
+@@ -409,7 +409,7 @@ msgstr ""
+ #: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+ msgid "Checking %s..."
+-msgstr "\"%s\"ta mallichkan... "
++msgstr "%s ta mallichkan..."
+ 
+ #  "Descargando %s..."
+ #: ../extensions/cpsection/updater/view.py:127
+@@ -453,13 +453,13 @@ msgstr "Kunanchanakunata churachkan..."
+ #, python-format
+ msgid "%s update was installed"
+ msgid_plural "%s updates were installed"
+-msgstr[0] "%s kunanchanata churaran "
++msgstr[0] "%s kunanchanata churaran"
+ msgstr[1] "%s kunanchanakunata churaran"
+ 
+ #  "Instalación seleccionada"
+ #: ../extensions/cpsection/updater/view.py:255
+ msgid "Install selected"
+-msgstr "Aqllasqa churanapaq "
++msgstr "Aqllasqa churanapaq"
+ 
+ #  "Tamaño de descarga: %s"
+ #: ../extensions/cpsection/updater/view.py:276
+@@ -565,7 +565,7 @@ msgstr "T'inkisqa"
+ #  "No hay conexión inalámbrica"
+ #: ../extensions/deviceicon/network.py:130
+ msgid "No wireless connection"
+-msgstr "Inalámbrica t'inkina mana kanchu."
++msgstr "Inalámbrica t'inkina mana kanchu"
+ 
+ #  "Canal"
+ #: ../extensions/deviceicon/network.py:144
+@@ -1358,7 +1358,7 @@ msgstr ""
+ #  "No se puede conectar al servidor."
+ #: ../src/jarabe/desktop/schoolserver.py:143
+ msgid "Cannot connect to the server."
+-msgstr "Servidorman mana t'inkiyta atinchu"
++msgstr "Servidorman mana t'inkiyta atinchu."
+ 
+ #  "El servidor no pudo completar el pedido."
+ #: ../src/jarabe/desktop/schoolserver.py:150
+@@ -1682,12 +1682,12 @@ msgstr ""
+ #  "Su diario está vacío"
+ #: ../src/jarabe/journal/listview.py:316
+ msgid "Your Journal is empty"
+-msgstr "Diario nisqaykiqa chusaq kachkan  "
++msgstr "Diario nisqaykiqa chusaq kachkan"
+ 
+ #  "Tu carpeta de documentos está vacía"
+ #: ../src/jarabe/journal/listview.py:319
+ msgid "Your documents folder is empty"
+-msgstr "Wayaqaykiqa chusaq kachkan "
++msgstr "Wayaqaykiqa chusaq kachkan"
+ 
+ #  "El dispositivo está vacío"
+ #: ../src/jarabe/journal/listview.py:321
+@@ -1846,7 +1846,7 @@ 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 "IP kamachinaqa mana allinñachu"
++msgstr "IP kamachinaqa mana allinñachu."
+ 
+ #  "Claves requeridas, pero no fueron suministradas."
+ #: ../src/jarabe/model/network.py:178
+@@ -1955,7 +1955,7 @@ msgstr ""
+ #  "Llamada falló."
+ #: ../src/jarabe/model/network.py:220
+ msgid "Dialing failed."
+-msgstr "Waqyanaqa pantaran"
++msgstr "Waqyanaqa pantaran."
+ 
+ #  "Fallo en inicialización de modem."
+ #: ../src/jarabe/model/network.py:222
+@@ -2072,7 +2072,7 @@ msgstr "Qallarichkan..."
+ #  "Actividad falló al iniciar"
+ #: ../src/jarabe/view/palettes.py:58
+ msgid "Activity failed to start"
+-msgstr "Ruwanaqa qallarispa pantaran."
++msgstr "Ruwanaqa qallarispa pantaran"
+ 
+ #  "Ver fuente"
+ #. TODO: share-with, keep
+@@ -2098,7 +2098,7 @@ msgstr "Ukhunpi qhaway"
+ #  "Eliminar"
+ #: ../src/jarabe/view/palettes.py:229
+ msgid "Remove"
+-msgstr "Qhichuy"
++msgstr "Chinkachiy"
+ 
+ #  "Fuente de la instancia"
+ #: ../src/jarabe/view/viewsource.py:263
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0007-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0007-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..a9cdcb4
--- /dev/null
+++ b/rpms/sugar/0007-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,121 @@
+From 9a0b85ff8b13eb5397e30dd93ae7ec61d62856e1 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 23 Nov 2011 19:20:07 +0200
+Subject: [PATCH sugar 07/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 96 of 379 messages translated (5
+ fuzzy).
+
+---
+ po/aym.po |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/po/aym.po b/po/aym.po
+index 9fbe07e..959eaef 100644
+--- a/po/aym.po
++++ b/po/aym.po
+@@ -7,7 +7,7 @@ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2011-10-20 00:32-0400\n"
+-"PO-Revision-Date: 2011-11-23 07:42+0200\n"
++"PO-Revision-Date: 2011-11-23 17:04+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: aym\n"
+@@ -74,7 +74,7 @@ msgstr "Kumputaruraja tuqita"
+ #  "No disponible"
+ #: ../extensions/cpsection/aboutcomputer/model.py:43
+ msgid "Not available"
+-msgstr "jani wakisiri"
++msgstr "Jani wakisiri"
+ 
+ #  "%(interface)s: %(version)s"
+ #: ../extensions/cpsection/aboutcomputer/model.py:183
+@@ -167,12 +167,12 @@ msgstr "Chanipaxa parisa jakhuñapawa."
+ #  "nunca"
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr "Janipuniwa"
++msgstr "janipuniwa"
+ 
+ #  "instantáneo"
+ #: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+-msgstr "Mäpita"
++msgstr "mäpita"
+ 
+ #: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+@@ -330,7 +330,7 @@ msgstr ""
+ 
+ #: ../extensions/cpsection/network/view.py:140
+ msgid "Server:"
+-msgstr "katuqiri"
++msgstr "Katuqiri:"
+ 
+ #: ../extensions/cpsection/power/__init__.py:21
+ msgid "Power"
+@@ -338,11 +338,11 @@ msgstr "Ch'ama"
+ 
+ #: ../extensions/cpsection/power/model.py:90
+ msgid "Error in automatic pm argument, use on/off."
+-msgstr "Pantjata automatic pm amuyt'awipa janiwa/jisa"
++msgstr "Pantjata automatic pm amuyt'awipa janiwa/jisa."
+ 
+ #: ../extensions/cpsection/power/model.py:120
+ msgid "Error in extreme pm argument, use on/off."
+-msgstr "Pantjata extreme pm amuyt'awipa janiwa/jisa"
++msgstr "Pantjata extreme pm amuyt'awipa janiwa/jisa."
+ 
+ #: ../extensions/cpsection/power/view.py:48
+ msgid "Power management"
+@@ -367,12 +367,12 @@ msgid ""
+ "provide new features."
+ msgstr ""
+ "amuyt'awi machaqaptayañanaka pantjatanaka askichaña, pantjatanaka jarqayaña, "
+-"machaq amuyt'awinaka"
++"machaq amuyt'awinaka."
+ 
+ #: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+ msgid "Checking %s..."
+-msgstr "yant'aski %s..."
++msgstr "Yant'aski %s..."
+ 
+ #: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+@@ -397,11 +397,11 @@ msgstr[1] "uchantaña qalltasmawa machaqachañanaka"
+ 
+ #: ../extensions/cpsection/updater/view.py:159
+ msgid "Checking for updates..."
+-msgstr "machaqaptayañanaka thaqaski"
++msgstr "machaqaptayañanaka thaqaski..."
+ 
+ #: ../extensions/cpsection/updater/view.py:164
+ msgid "Installing updates..."
+-msgstr "machaqaptayaña ut'ayaski"
++msgstr "machaqaptayaña ut'ayaski..."
+ 
+ #: ../extensions/cpsection/updater/view.py:173
+ #, python-format, fuzzy
+@@ -490,7 +490,7 @@ msgstr "jaljtayaña"
+ #: ../src/jarabe/desktop/networkviews.py:548
+ #: ../src/jarabe/desktop/networkviews.py:683
+ msgid "Connecting..."
+-msgstr "Mayachasa"
++msgstr "Mayachasa..."
+ 
+ #: ../extensions/deviceicon/network.py:117
+ #: ../extensions/deviceicon/network.py:185
+@@ -1726,7 +1726,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/view/palettes.py:102
+ msgid "Stop"
+-msgstr ""
++msgstr "Sayt'ayaña"
+ 
+ #: ../src/jarabe/view/palettes.py:139
+ msgid "Start new"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0008-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0008-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..0abbe79
--- /dev/null
+++ b/rpms/sugar/0008-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,97 @@
+From b4261bc90bbad048f41ec5e0c8846b01b1cc900c Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Wed, 23 Nov 2011 19:23:10 +0200
+Subject: [PATCH sugar 08/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 202 of 379 messages translated (15
+ fuzzy).
+
+---
+ po/quz.po |   20 +++++++++++---------
+ 1 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/po/quz.po b/po/quz.po
+index 3e3a080..ca61ad1 100644
+--- a/po/quz.po
++++ b/po/quz.po
+@@ -4,7 +4,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-11-23 16:10+0200\n"
++"PO-Revision-Date: 2011-11-23 16:59+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: Runasimipi.org\n"
+ "Language: quz\n"
+@@ -168,7 +168,7 @@ msgstr "Tukuy kanan huk llipin yupana."
+ #  "nunca"
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr "Ni haykaqpis"
++msgstr "ni haykaqpis"
+ 
+ #  "instantáneo"
+ #: ../extensions/cpsection/frame/view.py:28
+@@ -229,7 +229,7 @@ msgstr "Simi"
+ #: ../extensions/cpsection/language/model.py:30
+ #, fuzzy
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "Mana \"~/.i18n\"pi yaykuyta atikunchu."
++msgstr "Mana ~/.i18n\"pi yaykuyta atikunchu."
+ 
+ #  "El lenguaje del código=%s no pudo ser determinado."
+ #: ../extensions/cpsection/language/model.py:129
+@@ -415,13 +415,13 @@ msgstr "%s ta mallichkan..."
+ #: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+ msgid "Downloading %s..."
+-msgstr "\"%s\"ta urayachispa..."
++msgstr "%s ta urayachispa..."
+ 
+ #  "Actualizando %s..."
+ #: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+ msgid "Updating %s..."
+-msgstr "\"%s\"ta kunanchachkan..."
++msgstr "%s ta kunanchachkan..."
+ 
+ #  "Tu software esta actualizado"
+ #: ../extensions/cpsection/updater/view.py:139
+@@ -1429,10 +1429,11 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:691
+ #, python-format
+ msgid "Transfer to %s"
+-msgstr "%sman apachiy"
++msgstr "%s man apachiy"
+ 
+ #  "Eliminar"
+ #: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
+ msgid "Remove"
+ msgstr "Chinkachiy"
+ 
+@@ -2056,7 +2057,7 @@ msgstr "Aqllasqaykuna"
+ #: ../src/jarabe/view/buddymenu.py:142
+ #, python-format, fuzzy
+ msgid "Invite to %s"
+-msgstr "%sman mink'ay"
++msgstr "%s man mink'ay"
+ 
+ #  "<b>%s</b> falló al iniciar."
+ #: ../src/jarabe/view/launcher.py:145
+@@ -2095,10 +2096,11 @@ msgstr "Musuqta qallariy"
+ msgid "Show contents"
+ msgstr "Ukhunpi qhaway"
+ 
+-#  "Eliminar"
++#  "Quitar"
+ #: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
+ msgid "Remove"
+-msgstr "Chinkachiy"
++msgstr "Qhichuy"
+ 
+ #  "Fuente de la instancia"
+ #: ../src/jarabe/view/viewsource.py:263
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0009-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0009-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..b12f986
--- /dev/null
+++ b/rpms/sugar/0009-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,330 @@
+From 7d11f7a2d58e97df6df6f388f17a205aed2b1f80 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Thu, 24 Nov 2011 05:24:53 +0200
+Subject: [PATCH sugar 09/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 132 of 379 messages translated (6
+ fuzzy).
+
+---
+ po/aym.po |   78 ++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/po/aym.po b/po/aym.po
+index 959eaef..5033a2d 100644
+--- a/po/aym.po
++++ b/po/aym.po
+@@ -7,7 +7,7 @@ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2011-10-20 00:32-0400\n"
+-"PO-Revision-Date: 2011-11-23 17:04+0200\n"
++"PO-Revision-Date: 2011-11-24 05:24+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: aym\n"
+@@ -463,9 +463,9 @@ msgid "Very little power remaining"
+ msgstr "pisi ch'amanikxiwa watiriyaxa"
+ 
+ #: ../extensions/deviceicon/battery.py:158
+-#, python-format
++#, python-format, fuzzy
+ msgid "%(hour)d:%(min).2d remaining"
+-msgstr ""
++msgstr "%(hour)d:%(min).2d jilt'iri"
+ 
+ #  "Cargada"
+ #: ../extensions/deviceicon/battery.py:161
+@@ -514,7 +514,7 @@ msgstr "Chinu taypit mayachasiña"
+ 
+ #: ../extensions/deviceicon/network.py:188
+ msgid "Speed"
+-msgstr ""
++msgstr "Ratuki"
+ 
+ #: ../extensions/deviceicon/network.py:213
+ msgid "Wireless modem"
+@@ -529,7 +529,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:505
+ #: ../src/jarabe/desktop/networkviews.py:639
+ msgid "Connect"
+-msgstr ""
++msgstr "Mayachaña"
+ 
+ #: ../extensions/deviceicon/network.py:287
+ msgid "Disconnected"
+@@ -542,7 +542,7 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:704
+ #: ../src/jarabe/frame/activitiestray.py:732
+ msgid "Cancel"
+-msgstr ""
++msgstr "Tukuyaña"
+ 
+ #: ../extensions/deviceicon/network.py:333
+ msgid "Try connection again"
+@@ -551,7 +551,7 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:336
+ #, python-format
+ msgid "Error: %s"
+-msgstr ""
++msgstr "Pantjata: %s"
+ 
+ #: ../extensions/deviceicon/network.py:340
+ #, python-format
+@@ -567,7 +567,7 @@ msgstr ""
+ #: ../extensions/deviceicon/network.py:356
+ #, python-format
+ msgid "%d KB"
+-msgstr ""
++msgstr "%d KB"
+ 
+ #: ../extensions/deviceicon/network.py:361
+ msgid "Check your Pin/Puk configuration."
+@@ -612,7 +612,7 @@ msgstr ""
+ 
+ #: ../extensions/deviceicon/speaker.py:141
+ msgid "Mute"
+-msgstr ""
++msgstr "Amukt'ayaña"
+ 
+ #: ../extensions/deviceicon/touchpad.py:38
+ msgid "finger"
+@@ -709,7 +709,7 @@ msgstr ""
+ 
+ #: ../data/sugar.schemas.in.h:13
+ msgid "Edge Delay"
+-msgstr ""
++msgstr "Qawaya Qhipt'awi"
+ 
+ #: ../data/sugar.schemas.in.h:14
+ msgid "Favorites Layout"
+@@ -1042,7 +1042,7 @@ msgstr ""
+ #. TRANS: label for the box layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:515
+ msgid "Triangle"
+-msgstr ""
++msgstr "Kimsa k'uchu"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:338
+ msgid "Registration Failed"
+@@ -1051,7 +1051,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+ msgid "%s"
+-msgstr ""
++msgstr "%s"
+ 
+ #: ../src/jarabe/desktop/favoritesview.py:341
+ msgid "Registration Successful"
+@@ -1088,7 +1088,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/desktop/homebox.py:198
+ msgid "<Ctrl>2"
+-msgstr ""
++msgstr "<Ctrl>2"
+ 
+ #: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+@@ -1096,7 +1096,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+-msgstr ""
++msgstr "<Ctrl>1"
+ 
+ #: ../src/jarabe/desktop/keydialog.py:143
+ msgid "Key Type:"
+@@ -1119,7 +1119,7 @@ msgstr ""
+ #: ../src/jarabe/journal/journaltoolbox.py:509
+ #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+ msgid "Resume"
+-msgstr ""
++msgstr "Jutiri"
+ 
+ #: ../src/jarabe/desktop/meshbox.py:96
+ #: ../src/jarabe/frame/activitiestray.py:182
+@@ -1152,17 +1152,17 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:523
+ #, python-format
+ msgid "%dB"
+-msgstr ""
++msgstr "%dB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:525
+ #, python-format
+ msgid "%dKB"
+-msgstr ""
++msgstr "%dKB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:527
+ #, python-format
+ msgid "%dMB"
+-msgstr ""
++msgstr "%dMB"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:544
+ #, python-format
+@@ -1182,7 +1182,7 @@ msgstr ""
+ #: ../src/jarabe/frame/activitiestray.py:722
+ #, python-format
+ msgid "%s (%s)"
+-msgstr ""
++msgstr "%s (%s)"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:626
+ #: ../src/jarabe/frame/activitiestray.py:639
+@@ -1202,12 +1202,12 @@ msgstr ""
+ #: ../src/jarabe/frame/clipboardmenu.py:56
+ msgctxt "Clipboard"
+ msgid "Remove"
+-msgstr ""
++msgstr "Chhaqtayaña"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:62
+ #: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+-msgstr ""
++msgstr "Uñantaña"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+@@ -1220,23 +1220,23 @@ msgstr ""
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "Neighborhood"
+-msgstr ""
++msgstr "Wakisirinaka"
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "F1"
+-msgstr ""
++msgstr "F1"
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:41
+ msgid "F2"
+-msgstr ""
++msgstr "F2"
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:43
+ msgid "F3"
+-msgstr ""
++msgstr "F3"
+ 
+ #: ../src/jarabe/frame/zoomtoolbar.py:45
+ msgid "F4"
+-msgstr ""
++msgstr "F4"
+ 
+ #  "Nombre:"
+ #: ../src/jarabe/intro/window.py:90
+@@ -1255,7 +1255,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+-msgstr ""
++msgstr "Jutiri"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:156
+ #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
+@@ -1276,17 +1276,17 @@ msgstr ""
+ #: ../src/jarabe/journal/listmodel.py:150
+ #: ../src/jarabe/journal/listmodel.py:158
+ msgid "Unknown"
+-msgstr ""
++msgstr "Jani uñt'ata"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:265
+ #, python-format
+ msgid "Date: %s"
+-msgstr ""
++msgstr "Uru chimpu: %s"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:266
+ #, python-format
+ msgid "Size: %s"
+-msgstr ""
++msgstr "Taña: %s"
+ 
+ #: ../src/jarabe/journal/expandedentry.py:294
+ #: ../src/jarabe/journal/misc.py:108
+@@ -1310,7 +1310,7 @@ msgstr ""
+ #: ../src/jarabe/journal/palettes.py:198
+ #: ../src/jarabe/journal/volumestoolbar.py:368
+ msgid "Journal"
+-msgstr ""
++msgstr "Sapüru luräwi"
+ 
+ #: ../src/jarabe/journal/journaltoolbox.py:72
+ msgid "Search"
+@@ -1367,7 +1367,7 @@ msgstr ""
+ #: ../src/jarabe/journal/journaltoolbox.py:404
+ #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+ msgid "Duplicate"
+-msgstr ""
++msgstr "Payaptayaña"
+ 
+ #: ../src/jarabe/journal/journaltoolbox.py:437
+ #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
+@@ -1380,13 +1380,13 @@ msgstr ""
+ #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
+ #: ../src/jarabe/journal/volumestoolbar.py:316
+ msgid "Error"
+-msgstr ""
++msgstr "Pantjata"
+ 
+ #. TRANS: Action label for starting an entry.
+ #: ../src/jarabe/journal/journaltoolbox.py:512
+ #: ../src/jarabe/journal/palettes.py:74
+ msgid "Start"
+-msgstr ""
++msgstr "Qalltawi"
+ 
+ #: ../src/jarabe/journal/journaltoolbox.py:540
+ msgid "Sort by date modified"
+@@ -1453,7 +1453,7 @@ msgstr ""
+ #: ../src/jarabe/journal/objectchooser.py:151
+ #: ../src/jarabe/view/viewsource.py:410
+ msgid "Close"
+-msgstr ""
++msgstr "Jiwayaña"
+ 
+ #: ../src/jarabe/journal/palettes.py:72
+ msgid "Resume with"
+@@ -1486,7 +1486,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/journal/palettes.py:267
+ msgid "Clipboard"
+-msgstr ""
++msgstr "Laphi k'ipi"
+ 
+ #: ../src/jarabe/journal/palettes.py:322
+ msgid "No friends present"
+@@ -1691,7 +1691,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/view/buddymenu.py:95
+ msgid "Restart"
+-msgstr ""
++msgstr "Wasitata qalltaña"
+ 
+ #: ../src/jarabe/view/buddymenu.py:101
+ msgid "Logout"
+@@ -1739,7 +1739,7 @@ msgstr ""
+ #: ../src/jarabe/view/palettes.py:229
+ msgctxt "Volume"
+ msgid "Remove"
+-msgstr ""
++msgstr "Chhaqtayaña"
+ 
+ #: ../src/jarabe/view/viewsource.py:263
+ msgid "Instance Source"
+@@ -1747,7 +1747,7 @@ msgstr ""
+ 
+ #: ../src/jarabe/view/viewsource.py:312
+ msgid "Source"
+-msgstr ""
++msgstr "Naktayiri"
+ 
+ #: ../src/jarabe/view/viewsource.py:374
+ msgid "Activity Bundle Source"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0010-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0010-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..11031df
--- /dev/null
+++ b/rpms/sugar/0010-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,152 @@
+From d327f755aad4813969a97ea6bae06b3c8fbd2213 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Sat, 26 Nov 2011 08:33:12 +0200
+Subject: [PATCH sugar 10/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 215 of 379 messages translated (7
+ fuzzy).
+
+---
+ po/quz.po |   27 ++++++++++-----------------
+ 1 files changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/po/quz.po b/po/quz.po
+index ca61ad1..8aac412 100644
+--- a/po/quz.po
++++ b/po/quz.po
+@@ -4,7 +4,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-11-23 16:59+0200\n"
++"PO-Revision-Date: 2011-11-26 08:31+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: Runasimipi.org\n"
+ "Language: quz\n"
+@@ -60,7 +60,6 @@ msgstr "Pantay aqllasqa llimp'ikunapi."
+ 
+ #  "Clic para cambiar su color:"
+ #: ../extensions/cpsection/aboutme/view.py:235
+-#, fuzzy
+ msgid "Click to change your color:"
+ msgstr "Llimp'iykita aqllanapaq klik ruway:"
+ 
+@@ -144,7 +143,6 @@ msgstr "Punchaypis Horapis"
+ 
+ #  "Error, zona horaria no existe."
+ #: ../extensions/cpsection/datetime/model.py:92
+-#, fuzzy
+ msgid "Error timezone does not exist."
+ msgstr "Pantay: horaqpa suyun mana kanchu."
+ 
+@@ -204,7 +202,6 @@ msgstr "Ñit'ina"
+ 
+ #  "Modelo de teclado"
+ #: ../extensions/cpsection/keyboard/view.py:190
+-#, fuzzy
+ msgid "Keyboard Model"
+ msgstr "Sumaq ñit'ina chhalay"
+ 
+@@ -215,7 +212,6 @@ msgstr "Ñit'ina wakpaq ñit'ina(kuna)"
+ 
+ #  "Diseño(s) de teclado"
+ #: ../extensions/cpsection/keyboard/view.py:319
+-#, fuzzy
+ msgid "Keyboard Layout(s)"
+ msgstr "Ñit'ina(kuna) chhalay"
+ 
+@@ -227,7 +223,6 @@ 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 ~/.i18n\"pi yaykuyta atikunchu."
+ 
+@@ -239,7 +234,7 @@ msgstr "Chimpu=%s, chay simi mana riqsisqachu."
+ 
+ #  "Lo siento, yo no hablo '%s'."
+ #: ../extensions/cpsection/language/model.py:152
+-#, python-format, fuzzy
++#, python-format, 
+ msgid "Sorry I do not speak '%s'."
+ msgstr "Sentine, mana rimanichi '%s'."
+ 
+@@ -1146,7 +1141,7 @@ msgstr ""
+ #  "Cancelar cambios"
+ #: ../src/jarabe/controlpanel/gui.py:300
+ msgid "Cancel changes"
+-msgstr ""
++msgstr "T'krasqakunata chinkachiy"
+ 
+ #  "Después"
+ #: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+@@ -1191,7 +1186,7 @@ msgstr ""
+ #: ../src/jarabe/frame/clipboardmenu.py:67
+ #: ../src/jarabe/view/viewsource.py:280
+ msgid "Keep"
+-msgstr ""
++msgstr "Kikinchata waqaychay"
+ 
+ #  "Borrar"
+ #: ../src/jarabe/desktop/activitieslist.py:365
+@@ -1215,7 +1210,7 @@ msgstr "Aqllasqata ruway"
+ #. TRANS: label for the freeform layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:127
+ msgid "Freeform"
+-msgstr ""
++msgstr "Qispi siq'ichasqa"
+ 
+ #  "Anillo"
+ #. TRANS: label for the ring layout in the favorites view
+@@ -1232,9 +1227,8 @@ msgstr "Espiral"
+ #  "Caja"
+ #. TRANS: label for the box layout in the favorites view
+ #: ../src/jarabe/desktop/favoriteslayout.py:472
+-#, fuzzy
+ msgid "Box"
+-msgstr "P'uktaki"
++msgstr "Tawak'uchu"
+ 
+ #  "Triángulo"
+ #. TRANS: label for the box layout in the favorites view
+@@ -1266,7 +1260,7 @@ msgstr ""
+ #  "Registro"
+ #: ../src/jarabe/desktop/favoritesview.py:641
+ msgid "Register"
+-msgstr ""
++msgstr "Qillqachina"
+ 
+ #  "Registrar nuevamente"
+ #: ../src/jarabe/desktop/favoritesview.py:643
+@@ -1555,7 +1549,7 @@ msgstr "Aswan willay:"
+ #  "Etiquetas:"
+ #: ../src/jarabe/journal/expandedentry.py:348
+ msgid "Tags:"
+-msgstr ""
++msgstr "Sutichaq:"
+ 
+ #  "Diario"
+ #: ../src/jarabe/journal/journalactivity.py:115
+@@ -1666,9 +1660,8 @@ msgstr "P'unchaywan siqichay"
+ 
+ #  "Ordenar por fecha de creación"
+ #: ../src/jarabe/journal/journaltoolbox.py:526
+-#, fuzzy
+ msgid "Sort by date created"
+-msgstr "P'unchaywan siqichay"
++msgstr ""
+ 
+ #  "Ordenar por tamaño"
+ #: ../src/jarabe/journal/journaltoolbox.py:527
+@@ -1810,7 +1803,7 @@ msgstr "Qillqa q'ipikuna"
+ #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
+ #, python-format
+ msgid "%(free_space)d MB Free"
+-msgstr ""
++msgstr "%(free_space)d MB Qispisqa"
+ 
+ #  "La razón para el cambio de estado del dispositivo es desconocida."
+ #: ../src/jarabe/model/network.py:163
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0011-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0011-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..d3b32ff
--- /dev/null
+++ b/rpms/sugar/0011-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,64 @@
+From 07eb94622ab0f5863cfde3a773e2d28f65515154 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Sun, 27 Nov 2011 01:20:11 +0200
+Subject: [PATCH sugar 11/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 105 of 379 messages translated (16
+ fuzzy).
+
+---
+ po/te.po |   14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/po/te.po b/po/te.po
+index 9b88e94..15e14b7 100644
+--- a/po/te.po
++++ b/po/te.po
+@@ -7,13 +7,15 @@ 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: 2008-07-24 12:16-0400\n"
+-"Last-Translator: Sayamindu Dasgupta <sayamindu@gmail.com>\n"
++"PO-Revision-Date: 2011-11-27 01:19+0200\n"
++"Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: te\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"
+@@ -185,7 +187,7 @@ msgstr "భాష"
+ #: ../extensions/cpsection/language/model.py:30
+ #, fuzzy
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr "%s ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
++msgstr " ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
+ 
+ #: ../extensions/cpsection/language/model.py:129
+ #, python-format
+@@ -557,7 +559,7 @@ msgstr "మెష్ వల"
+ #: ../extensions/deviceicon/network.py:656
+ #, python-format, fuzzy
+ msgid "Mesh Network %s"
+-msgstr "మెష్ వల"
++msgstr "మెష్ వల %s"
+ 
+ #: ../extensions/deviceicon/network.py:779
+ msgid "No GSM connection available."
+@@ -1105,7 +1107,7 @@ msgstr ""
+ #: ../src/jarabe/desktop/networkviews.py:634
+ #, python-format, fuzzy
+ msgid "Mesh Network %d"
+-msgstr "మెష్ వల"
++msgstr "మెష్ వల %d"
+ 
+ #: ../src/jarabe/desktop/schoolserver.py:143
+ msgid "Cannot connect to the server."
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0012-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch b/rpms/sugar/0012-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
new file mode 100644
index 0000000..9c5b821
--- /dev/null
+++ b/rpms/sugar/0012-Commit-from-Sugar-Labs-Translation-System-by-user-cj.patch
@@ -0,0 +1,117 @@
+From 24ea1bc47ed29c3f670371cdf5dee63d6441dbb9 Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Mon, 28 Nov 2011 07:24:01 +0200
+Subject: [PATCH sugar 12/74] Commit from Sugar Labs: Translation System by
+ user cjl.: 187 of 379 messages translated (2
+ fuzzy).
+
+---
+ po/sq.po |   24 +++++++++++-------------
+ 1 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/po/sq.po b/po/sq.po
+index 30bf88c..0b4b67c 100644
+--- a/po/sq.po
++++ b/po/sq.po
+@@ -7,7 +7,7 @@ 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: 2011-09-27 17:17+0200\n"
++"PO-Revision-Date: 2011-11-28 07:22+0200\n"
+ "Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: sq\n"
+@@ -23,7 +23,7 @@ msgstr "Rreth Meje"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr "Vetem emri duhet shkruar"
++msgstr "Vetem emri duhet shkruar."
+ 
+ #: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+@@ -124,7 +124,7 @@ msgstr "Data & Koha"
+ 
+ #: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+-msgstr "Gabim zona e kohës nuk ekziston"
++msgstr "Gabim zona e kohës nuk ekziston."
+ 
+ #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+@@ -198,7 +198,7 @@ msgstr ""
+ #: ../extensions/cpsection/language/model.py:152
+ #, python-format
+ msgid "Sorry I do not speak '%s'."
+-msgstr "Më vjen keq unë nuk flas ´%s´."
++msgstr "Më vjen keq unë nuk flas '%s'."
+ 
+ #: ../extensions/cpsection/language/view.py:57
+ msgid ""
+@@ -325,7 +325,7 @@ msgstr ""
+ #: ../extensions/cpsection/updater/__init__.py:21
+ #, fuzzy
+ msgid "Software update"
+-msgstr "Përditsim Softueri"
++msgstr "Përditsim softueri"
+ 
+ #: ../extensions/cpsection/updater/view.py:63
+ msgid ""
+@@ -529,9 +529,9 @@ msgstr ""
+ 
+ #: ../extensions/deviceicon/network.py:355
+ #: ../extensions/deviceicon/network.py:356
+-#, python-format, fuzzy
++#, python-format, 
+ msgid "%d KB"
+-msgstr "%dKB"
++msgstr "%d KB"
+ 
+ #: ../extensions/deviceicon/network.py:361
+ msgid "Check your Pin/Puk configuration."
+@@ -868,7 +868,7 @@ msgstr "Niveli i Volumit"
+ 
+ #: ../data/sugar.schemas.in.h:61
+ msgid "Volume level for the sound device."
+-msgstr "Niveli i volumit për pajisjen"
++msgstr "Niveli i volumit për pajisjen."
+ 
+ #: ../data/sugar.schemas.in.h:62
+ msgid ""
+@@ -1053,7 +1053,7 @@ msgstr "<Ctrl>2"
+ 
+ #: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+-msgstr "Shfaq Favoritët"
++msgstr "Shfaq favoritët"
+ 
+ #: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+@@ -1161,10 +1161,9 @@ msgid "Transfer to %s"
+ msgstr "Transfer tek %s"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:56
+-#, fuzzy
+ msgctxt "Clipboard"
+ msgid "Remove"
+-msgstr "Fshije"
++msgstr "Largo"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:62
+ #: ../src/jarabe/frame/clipboardmenu.py:85
+@@ -1697,10 +1696,9 @@ msgid "Show contents"
+ msgstr "Shfaq përmbajtjen"
+ 
+ #: ../src/jarabe/view/palettes.py:229
+-#, fuzzy
+ msgctxt "Volume"
+ msgid "Remove"
+-msgstr "Fshije"
++msgstr "Largo"
+ 
+ #: ../src/jarabe/view/viewsource.py:263
+ msgid "Instance Source"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0013-Control-Panel-Power-section-check-if-powerd-is-avail.patch b/rpms/sugar/0013-Control-Panel-Power-section-check-if-powerd-is-avail.patch
new file mode 100644
index 0000000..23a6f9e
--- /dev/null
+++ b/rpms/sugar/0013-Control-Panel-Power-section-check-if-powerd-is-avail.patch
@@ -0,0 +1,47 @@
+From ab59f75d4e6e7a95975a9311344f5a4f2120cd1c Mon Sep 17 00:00:00 2001
+From: Simon Schampijer <simon@schampijer.de>
+Date: Mon, 28 Nov 2011 10:02:31 +0100
+Subject: [PATCH sugar 13/74] Control Panel, Power section: check if powerd is
+ available OLPC #11437
+
+Recent versions of the kernel export the Open Firmware device tree to
+user space as /proc/device-tree, rather than /ofw (the latter was
+specific to OLPC kernels). We checked for existence of /ofw to determine
+whether we're running on an OLPC XO and assumed it's running
+olpc-powerd, since that is what we actually try to control. By checking
+for a directory created by olpc-powerd, we make sure that it's actually
+available (to us) and works on any kernel version.
+
+Check if powerd is available to determine if the power section
+is displayed or not.
+
+Signed-off-by: Simon Schampijer <simon@laptop.org>
+Acked-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ src/jarabe/controlpanel/gui.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
+index 2f55951..46810aa 100644
+--- a/src/jarabe/controlpanel/gui.py
++++ b/src/jarabe/controlpanel/gui.py
+@@ -30,6 +30,7 @@
+ from jarabe.controlpanel.toolbar import SectionToolbar
+ from jarabe import config
+ 
++POWERD_FLAG_DIR = '/etc/powerd/flags'
+ 
+ _logger = logging.getLogger('ControlPanel')
+ 
+@@ -129,7 +130,7 @@ def _setup_main(self):
+                                    self.__search_changed_cb)
+ 
+     def _setup_options(self):
+-        if not os.path.exists('/ofw'):
++        if not os.access(POWERD_FLAG_DIR, os.W_OK):
+             del self._options['power']
+ 
+         try:
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0014-Commit-from-Sugar-Labs-Translation-System-by-user-an.patch b/rpms/sugar/0014-Commit-from-Sugar-Labs-Translation-System-by-user-an.patch
new file mode 100644
index 0000000..31842ec
--- /dev/null
+++ b/rpms/sugar/0014-Commit-from-Sugar-Labs-Translation-System-by-user-an.patch
@@ -0,0 +1,387 @@
+From b5a869340a931744e5b3e05a50d6bfffd78d7cdd Mon Sep 17 00:00:00 2001
+From: Pootle daemon <pootle@pootle.sugarlabs.org>
+Date: Mon, 12 Dec 2011 15:43:31 +0200
+Subject: [PATCH sugar 14/74] Commit from Sugar Labs: Translation System by
+ user anush.mkrtchyan.: 377 of 379 messages
+ translated (2 fuzzy).
+
+---
+ po/hy.po |  100 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 52 insertions(+), 48 deletions(-)
+
+diff --git a/po/hy.po b/po/hy.po
+index 9ee2940..652f85a 100644
+--- a/po/hy.po
++++ b/po/hy.po
+@@ -2,19 +2,20 @@
+ # 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"
++"PO-Revision-Date: 2011-12-12 15:42+0200\n"
++"Last-Translator: anush.mkrtchyan <anush.mkrtchyan@ca1492.com>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: hy\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"
++"Plural-Forms: nplurals=2; plural=(n > 1);\n"
++"X-Generator: Pootle 2.0.5\n"
+ 
+ #: ../extensions/cpsection/aboutme/__init__.py:24
+ msgid "About Me"
+@@ -22,7 +23,7 @@ msgstr "իմ մասին"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr "Դուք պետ է մուտքագրեք անուն:"
++msgstr "Դուք պետ է անուն մուտքագրեք:"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+@@ -50,11 +51,11 @@ msgstr "Վրիպում գույնի ընտրված ցուցիչներում:"
+ 
+ #: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+-msgstr "Ընտրված գույների վրիպում:"
++msgstr "Վրիպակ` ընտրված գույներում:"
+ 
+ #: ../extensions/cpsection/aboutme/view.py:235
+ msgid "Click to change your color:"
+-msgstr "Քլիք գույնը փոփոխելու համար."
++msgstr "Քլիք` գույնը փոփոխելու համար."
+ 
+ #: ../extensions/cpsection/aboutcomputer/__init__.py:21
+ msgid "About my Computer"
+@@ -75,7 +76,7 @@ msgstr "Ինքնություն"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:70
+ msgid "Serial Number:"
+-msgstr "Շարքյին Համար."
++msgstr "Ապրանքաշարի Համարը."
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:92
+ msgid "Software"
+@@ -110,7 +111,7 @@ msgid ""
+ msgstr ""
+ "Sugar-ը օգտվողի հետ հաղորդակցող այն գծագրային ծրագիրն է, որ դուք տեսում եք: "
+ "Sugar-ը անվճար ծրագիր է և կարգավորվում է GNU General Public արտոնագրով: Դուք "
+-"կարող եք օգտագործել և տարածել այն որոշակի ներքոշյալ պայմանների ներքո:"
++"կարող եք օգտագործել և տարածել այն ստորև բերված պայմաններով:"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:200
+ msgid "Full license:"
+@@ -122,7 +123,7 @@ msgstr "Ամսաթիվը և ժամը"
+ 
+ #: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+-msgstr "Վրիպում` ժամանակային գոտին գոյություն չունի:"
++msgstr "Ձախողում` ժամանակային գոտին գոյություն չունի:"
+ 
+ #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+@@ -135,11 +136,11 @@ msgstr "Շրջանակ"
+ #: ../extensions/cpsection/frame/model.py:41
+ #: ../extensions/cpsection/frame/model.py:66
+ msgid "Value must be an integer."
+-msgstr "Առժեքը պետք է տրվի ամբողջ թվով:"
++msgstr "Արժեքը պետք է տրվի ամբողջ թվով:"
+ 
+ #: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr "երբեք"
++msgstr "Երբեք"
+ 
+ #: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+@@ -148,7 +149,7 @@ msgstr "ակնթարթային"
+ #: ../extensions/cpsection/frame/view.py:29
+ #, python-format
+ msgid "%s seconds"
+-msgstr "%s վարկյան"
++msgstr "%s վայրկյան"
+ 
+ #: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+@@ -156,8 +157,9 @@ msgstr "Ակտիվացման Հետաձգում"
+ 
+ #: ../extensions/cpsection/frame/view.py:78
+ msgid "Corner"
+-msgstr "Անկույն"
++msgstr "Անկյուն"
+ 
++# Եզր
+ #: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+ msgstr "Կող"
+@@ -169,11 +171,11 @@ msgstr "Ստեղնաշար"
+ 
+ #: ../extensions/cpsection/keyboard/view.py:190
+ msgid "Keyboard Model"
+-msgstr "Ստեղնաշարի Մոդել"
++msgstr "Ստեղնաշարի նմուշ"
+ 
+ #: ../extensions/cpsection/keyboard/view.py:250
+ msgid "Key(s) to change layout"
+-msgstr "Դասավորությունը փոփոխման ծածքաբառեր"
++msgstr "Դասավորության փոփոխման ծածկաբառեր"
+ 
+ #: ../extensions/cpsection/keyboard/view.py:319
+ msgid "Keyboard Layout(s)"
+@@ -191,7 +193,7 @@ msgstr "Հնարավոր չէ մուտք գործել ~/.i18n. Ստեղծել ս
+ #: ../extensions/cpsection/language/model.py:129
+ #, python-format
+ msgid "Language for code=%s could not be determined."
+-msgstr "Ծածկագրի լեզուն code=%s չի կարող որոշվել:"
++msgstr "Ծածկագրի լեզուն code=%s  անծանոթ է:"
+ 
+ #: ../extensions/cpsection/language/model.py:152
+ #, python-format
+@@ -204,7 +206,7 @@ msgid ""
+ "the next in the list will be used."
+ msgstr ""
+ "Ավելացրեք լեզուները ձեր նախընտրած հաջորդականությամբ: Եթե թարգմանությունը "
+-"մատչելի չէ, կօգտագործվի ցուցակով հաջյորդը:"
++"չկա, ապա կօգտագործվի ցուցակով հաջյորդ լեզվի տարբերակը:"
+ 
+ #: ../extensions/cpsection/modemconfiguration/__init__.py:21
+ msgid "Modem Configuration"
+@@ -212,7 +214,7 @@ msgstr "Մոդեմի կազմաձևումը"
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:94
+ msgid "Username:"
+-msgstr "Մականուն."
++msgstr "Օգտվողի անունը."
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:106
+ msgid "Password:"
+@@ -232,15 +234,15 @@ msgstr "Անձնական Անհատական Համար (PIN)."
+ 
+ #: ../extensions/cpsection/modemconfiguration/view.py:154
+ msgid "Personal Unblocking Key (PUK):"
+-msgstr "Անձնական Արգելափակման բացման Գաղտնաբառ (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 ""
+-"Շարժական լայնաշերտ բջջային (3G) ցանցին միանալու համար ձեզ անհրաժեշտ է "
+-"տրամադրել հետևյալ տեղեկությունները`:"
++"Շարժական լայնաշերտ բջջային (3G) ցանցին միանալու համար անհրաժեշտ է որ դուք "
++"տրամադրեք հետևյալ տեղեկությունները."
+ 
+ #: ../extensions/cpsection/network/__init__.py:21
+ #: ../extensions/cpsection/network/view.py:29
+@@ -249,7 +251,7 @@ msgstr "Ցանց"
+ 
+ #: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+-msgstr "Կարգավիճակն անհայտ է:"
++msgstr "Վիճակն անհայտ է:"
+ 
+ #: ../extensions/cpsection/network/model.py:99
+ msgid "Error in specified radio argument use on/off."
+@@ -265,7 +267,7 @@ msgstr "Անլար"
+ 
+ #: ../extensions/cpsection/network/view.py:69
+ msgid "Turn off the wireless radio to save battery life"
+-msgstr "Անջատել անլար ռադիո սարքերը մարտկոցի հզորությունը տնտեսելու համար"
++msgstr "Անջատել անլար ռադիոանտենան` մարտկոցի հզորությունը տնտեսելու համար"
+ 
+ #: ../extensions/cpsection/network/view.py:82
+ msgid "Radio"
+@@ -273,7 +275,7 @@ msgstr "Ռադիո"
+ 
+ #: ../extensions/cpsection/network/view.py:98
+ msgid "Discard network history if you have trouble connecting to the network"
+-msgstr "Ջնջել ցանցին միացման պատմությունը միացման խնդիրների ծագման դեպքում"
++msgstr "Միացման խնդիրների ծագման դեպքում` ջնջել ցանցին միացման պատմությունը"
+ 
+ #: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+@@ -322,6 +324,8 @@ msgstr ""
+ msgid ""
+ "Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
++"Ծայրահեղ սնուցման կառավարում (անջատում է առանց հաղորդալարի ռադիոն, "
++"երկարացնում է մարտկոցի կյանքի տևողությունը)"
+ 
+ #: ../extensions/cpsection/updater/__init__.py:21
+ msgid "Software update"
+@@ -333,7 +337,7 @@ msgid ""
+ "provide new features."
+ msgstr ""
+ "Ծրագրային արդիականացումն ուղղում է վրիպումները, վերացնում է խոցելի "
+-"հատվածները և ընդձեռում նոր հնարավորութուններ"
++"հատվածները և ընդձեռում նոր հնարավորութուններ:"
+ 
+ #: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+@@ -355,11 +359,11 @@ msgid "Your software is up-to-date"
+ msgstr "Ձեր ծրագրերը արդիականացված են"
+ 
+ #: ../extensions/cpsection/updater/view.py:141
+-#, python-format
++#, python-format, 
+ msgid "You can install %s update"
+ msgid_plural "You can install %s updates"
+-msgstr[0] "Դուք կարող եք տեղադրել %s արդիականացումը"
+-msgstr[1] ""
++msgstr[0] "Դուք կարող եք տեղադրել %s արդիականացում"
++msgstr[1] "Դուք կարող եք տեղադրել %s արդիականացում"
+ 
+ #: ../extensions/cpsection/updater/view.py:159
+ msgid "Checking for updates..."
+@@ -370,11 +374,11 @@ msgid "Installing updates..."
+ msgstr "Արդիականացումների տեղադրում"
+ 
+ #: ../extensions/cpsection/updater/view.py:173
+-#, python-format
++#, python-format, 
+ msgid "%s update was installed"
+ msgid_plural "%s updates were installed"
+-msgstr[0] "Արդիականացումների %s տեղադրված է"
+-msgstr[1] ""
++msgstr[0] "%s արդիականացում տեղադրվեց"
++msgstr[1] "%s արդիականացում  տեղադրվեց"
+ 
+ #: ../extensions/cpsection/updater/view.py:255
+ msgid "Install selected"
+@@ -467,7 +471,7 @@ msgstr "Միացած է"
+ 
+ #: ../extensions/deviceicon/network.py:130
+ msgid "No wireless connection"
+-msgstr ""
++msgstr "Առանց հաղորդալարի ցանց չկա"
+ 
+ #: ../extensions/deviceicon/network.py:144
+ msgid "Channel"
+@@ -577,7 +581,7 @@ msgstr "Միացնել Ձայնը"
+ 
+ #: ../extensions/deviceicon/speaker.py:141
+ msgid "Mute"
+-msgstr "Անջատել Ձայնը"
++msgstr "Անձայն"
+ 
+ #: ../extensions/deviceicon/touchpad.py:38
+ msgid "finger"
+@@ -900,8 +904,8 @@ msgid ""
+ "sugar-control-panel: WARNING, found more than one option with the same name: "
+ "%s module: %r"
+ msgstr ""
+-"sugar-կառավար վահանակ. ԶԳՈՒՇԱՑՈՒՄ, գտնվել է ավելի քան մեկ տարբերակ նույն "
+-"անունով.%s մոդուլը.%r"
++"sugar-կառավար վահանակ. ԶԳՈՒՇԱՑՈՒՄ, գտնվել է նույն անունով ավելի քան մեկ "
++"տարբերակ .%s մոդուլը.%r"
+ 
+ #: ../src/jarabe/controlpanel/cmd.py:30
+ #, python-format
+@@ -1165,7 +1169,7 @@ msgstr "%s %s-ից"
+ #: ../src/jarabe/frame/activitiestray.py:558
+ #, python-format
+ msgid "Transfer from %s"
+-msgstr ""
++msgstr "Փոխանցել %s - ից"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:569
+ msgid "Accept"
+@@ -1185,17 +1189,17 @@ 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
+ msgid "Transfer to %s"
+-msgstr ""
++msgstr "Փոխանցել %s"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:56
+ msgctxt "Clipboard"
+ msgid "Remove"
+-msgstr ""
++msgstr "Հեռացնել"
+ 
+ #: ../src/jarabe/frame/clipboardmenu.py:62
+ #: ../src/jarabe/frame/clipboardmenu.py:85
+@@ -1352,7 +1356,7 @@ msgstr "Ամեն ինչը"
+ #: ../src/jarabe/journal/journaltoolbox.py:381
+ #: ../src/jarabe/journal/palettes.py:93
+ msgid "Copy to"
+-msgstr ""
++msgstr "Կրկնօրինակել"
+ 
+ #: ../src/jarabe/journal/journaltoolbox.py:389
+ #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+@@ -1400,11 +1404,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"
+@@ -1469,7 +1473,7 @@ msgstr "Դիտել Մանրամասները"
+ 
+ #: ../src/jarabe/journal/palettes.py:160
+ msgid "Entries without a file cannot be sent."
+-msgstr ""
++msgstr "Առանց ֆայլի գրառումները չեն կարող ուղարկվել"
+ 
+ #: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
+ #: ../src/jarabe/journal/volumestoolbar.py:306
+@@ -1494,13 +1498,13 @@ msgstr "Գրառումը շարունակելու համար չկա ոչ մի գ
+ 
+ #: ../src/jarabe/journal/volumestoolbar.py:209
+ msgid "Documents"
+-msgstr ""
++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 ՄԲ ազատ"
++msgstr "%(free_space)d ՄԲ ազատ տարածք"
+ 
+ #: ../src/jarabe/model/network.py:163
+ msgid "The reason for the device state change is unknown."
+@@ -1736,7 +1740,7 @@ msgstr "Ցույց տալ բովանդակությունը"
+ #: ../src/jarabe/view/palettes.py:229
+ msgctxt "Volume"
+ msgid "Remove"
+-msgstr ""
++msgstr "Հեռացնել"
+ 
+ #: ../src/jarabe/view/viewsource.py:263
+ msgid "Instance Source"
+@@ -1752,7 +1756,7 @@ msgstr "Գործողությունների փաթեթի աղբյուր"
+ 
+ #: ../src/jarabe/view/viewsource.py:393
+ msgid "Sugar Toolkit Source"
+-msgstr ""
++msgstr "«Sugar» Ծրագրերի Գործիքի աղբյուրը"
+ 
+ #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
+ #, python-format
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0015-Add-cpu-and-memory-resource-indicator-to-frame.patch b/rpms/sugar/0015-Add-cpu-and-memory-resource-indicator-to-frame.patch
new file mode 100644
index 0000000..4aa6700
--- /dev/null
+++ b/rpms/sugar/0015-Add-cpu-and-memory-resource-indicator-to-frame.patch
@@ -0,0 +1,276 @@
+From 29835fe3fd9c47665060836766ecc5cfd1fbb6c5 Mon Sep 17 00:00:00 2001
+From: anishmangal2002 <anishmangal2002@gmail.com>
+Date: Fri, 2 Jul 2010 20:45:28 +0530
+Subject: [PATCH sugar 15/74] Add cpu and memory resource indicator to frame
+
+This patch adds an icon to the frame, whose palette
+menu displays the memory and cpu resources. For computing
+free memory, the code reads the /proc/meminfo file (thanks
+quozl) and for computing cpu usage, the code reads the
+/proc/stat file.
+
+The frame icon is updated after every 5 seconds if required.
+Similarly, the palette menu entries are updated after every
+5 seconds as well.
+
+Signed-off-by: anishmangal2002 <anishmangal2002@gmail.com>
+[style fixes, increase weight of memory utilisation for "system mood" so
+bursts of CPU activity don't take us from "happy" directly to "sad";
+pop up on left click since there is no primary action]
+Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
+Reviewed-by: Sascha Silbe <sascha-pgp@silbe.org>
+---
+ extensions/deviceicon/Makefile.am  |    1 +
+ extensions/deviceicon/resources.py |  215 ++++++++++++++++++++++++++++++++++++
+ po/POTFILES.in                     |    1 +
+ 3 files changed, 217 insertions(+), 0 deletions(-)
+ create mode 100644 extensions/deviceicon/resources.py
+
+diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.am
+index 118d866..0d15c38 100644
+--- a/extensions/deviceicon/Makefile.am
++++ b/extensions/deviceicon/Makefile.am
+@@ -4,6 +4,7 @@ sugar_PYTHON = 		\
+ 	__init__.py	\
+ 	battery.py	\
+ 	network.py	\
++	resources.py	\
+ 	speaker.py	\
+ 	touchpad.py	\
+ 	volume.py
+diff --git a/extensions/deviceicon/resources.py b/extensions/deviceicon/resources.py
+new file mode 100644
+index 0000000..5e39d4e
+--- /dev/null
++++ b/extensions/deviceicon/resources.py
+@@ -0,0 +1,215 @@
++# Copyright (C) Anish Mangal <anishmangal2002@gmail.com>
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++from gettext import gettext as _
++import logging
++import os
++
++import gobject
++import gtk
++import gconf
++
++from sugar.graphics.tray import TrayIcon
++from sugar.graphics.xocolor import XoColor
++from sugar.graphics.palette import Palette
++from sugar.graphics import style
++
++
++_SYSTEM_MOODS = ['-sad', '-normal', '-happy']
++_ICON_NAME = 'computer'
++_UPDATE_INTERVAL = 5 * 1000
++
++
++class DeviceView(TrayIcon):
++
++    FRAME_POSITION_RELATIVE = 500
++
++    def __init__(self):
++        client = gconf.client_get_default()
++        self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
++        TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color)
++        self.create_palette()
++        self._icon_widget.connect('button-release-event', self._click_cb)
++
++    def create_palette(self):
++        self.palette = ResourcePalette(_('System resources'))
++        self.palette.set_group_id('frame')
++        self.palette.add_timer()
++        self.palette.connect('system-mood-changed',
++                self._system_mood_changed_cb)
++        return self.palette
++
++    def _system_mood_changed_cb(self, palette_, mood):
++        self.icon.props.icon_name = _ICON_NAME + mood
++
++    def _click_cb(self, widget, event):
++        self.palette_invoker.notify_right_click()
++
++
++class ResourcePalette(Palette):
++    __gsignals__ = {
++        'system-mood-changed': (gobject.SIGNAL_RUN_FIRST,
++                           gobject.TYPE_NONE,
++                           ([str])),
++    }
++
++    def __init__(self, primary_text):
++        Palette.__init__(self, label=primary_text)
++
++        self.vbox = gtk.VBox()
++        self.set_content(self.vbox)
++
++        self._cpu_text = gtk.Label()
++        self.vbox.pack_start(self._cpu_text, padding=style.DEFAULT_PADDING)
++        self._cpu_bar = gtk.ProgressBar()
++        self._cpu_bar.set_size_request(
++            style.zoom(style.GRID_CELL_SIZE * 4), -1)
++        self.vbox.pack_start(self._cpu_bar, padding=style.DEFAULT_PADDING)
++
++        self._memory_text = gtk.Label()
++        self.vbox.pack_start(self._memory_text, padding=style.DEFAULT_PADDING)
++        self._memory_bar = gtk.ProgressBar()
++        self._memory_bar.set_size_request(
++            style.zoom(style.GRID_CELL_SIZE * 4), -1)
++        self.vbox.pack_start(self._memory_bar, padding=style.DEFAULT_PADDING)
++
++        self._system_mood = None
++        try:
++            self._cpu_times = self._get_cpu_times_list()
++        except IOError:
++            logging.exception('An error ocurred while attempting to '
++                'read /proc/stat')
++            self._stop_computing_statistics()
++
++        self.vbox.show()
++        self._cpu_text.show()
++        self._cpu_bar.show()
++        self._memory_text.show()
++        self._memory_bar.show()
++
++    def add_timer(self):
++        gobject.timeout_add(_UPDATE_INTERVAL, self.__timer_cb)
++
++    def _get_cpu_times_list(self):
++        """Return various cpu times as read from /proc/stat
++
++        This method returns the following cpu times measured
++        in jiffies (1/100 of a second for x86 systems)
++        as an ordered list of numbers - [user, nice,
++        system, idle, iowait] where,
++
++        user: normal processes executing in user mode
++        nice: niced processes executing in user mode
++        system: processes executing in kernel mode
++        idle: twiddling thumbs
++        iowait: waiting for I/O to complete
++
++        Note: For systems having 2 or more CPU's, the above
++        numbers would be the cumulative sum of these times
++        for all CPU's present in the system.
++
++        """
++        return [int(count)
++           for count in file('/proc/stat').readline().split()[1:6]]
++
++    def _percentage_cpu_available(self):
++        """
++        Return free CPU resources as a percentage
++
++        """
++        _cpu_times_new = self._get_cpu_times_list()
++        _cpu_times_current = [(new - old)
++            for new, old in zip(_cpu_times_new, self._cpu_times)]
++        user_, nice_, system_, idle, iowait = _cpu_times_current
++        cpu_free = (idle + iowait) * 100.0 / sum(_cpu_times_current)
++        self._cpu_times = self._get_cpu_times_list()
++        return cpu_free
++
++    def _percentage_memory_available(self):
++        """
++        Return free memory as a percentage
++
++        """
++        for line in file('/proc/meminfo'):
++            name, value, unit_ = line.split()[:3]
++            if 'MemTotal:' == name:
++                total = int(value)
++            elif 'MemFree:' == name:
++                free = int(value)
++            elif 'Buffers:' == name:
++                buffers = int(value)
++            elif 'Cached:' == name:
++                cached = int(value)
++            elif 'Active:' == name:
++                break
++        return (free + buffers + cached) * 100.0 / total
++
++    def __timer_cb(self):
++        try:
++            cpu_in_use = 100 - self._percentage_cpu_available()
++            memory_in_use = 100 - self._percentage_memory_available()
++        except IOError:
++            logging.exception('An error ocurred while trying to '
++                'retrieve resource usage statistics')
++            self._stop_and_show_error()
++            return False
++        else:
++            self._cpu_text.set_label(_('CPU in use: %d%%' % cpu_in_use))
++            self._cpu_bar.set_fraction(float(cpu_in_use) / 100)
++            self._memory_text.set_label(_('Memory in use: %d%%' %
++                memory_in_use))
++            self._memory_bar.set_fraction(float(memory_in_use) / 100)
++
++            # both cpu_free and memory_free lie between 0-100
++            system_mood = _SYSTEM_MOODS[
++                    int(300 - (cpu_in_use + 2 * memory_in_use)) // 100]
++
++            # check if self._system_mood exists
++            try:
++                if self._system_mood != system_mood:
++                    self.emit('system-mood-changed', system_mood)
++                    self._system_mood = system_mood
++            except AttributeError:
++                self.emit('system-mood-changed', system_mood)
++                self._system_mood = system_mood
++
++            return True
++
++    def _stop_and_show_error(self):
++        """
++        Stop computing usage statistics and display an error message
++        since we've hit an exception.
++
++        """
++        # Use the existing _cpu_text label to display the error. Remove
++        # everything else.
++        self._cpu_text.set_size_request(
++            style.zoom(style.GRID_CELL_SIZE * 4), -1)
++        self._cpu_text.set_line_wrap(True)
++        self._cpu_text.set_text(_('Cannot compute CPU and memory usage '
++            'statistics!'))
++        self.vbox.remove(self._cpu_bar)
++        self.vbox.remove(self._memory_text)
++        self.vbox.remove(self._memory_bar)
++        self.emit('system-mood-changed', '-error')
++
++
++def setup(tray):
++    if not (os.path.exists('/proc/stat') and os.path.exists('/proc/meminfo')):
++        logging.warning('Either /proc/stat or /proc/meminfo not present. Not '
++            'adding the CPU and memory usage icon to the frame')
++        return
++    tray.add_device(DeviceView())
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 9e46831..b799339 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -27,6 +27,7 @@ extensions/cpsection/updater/__init__.py
+ extensions/cpsection/updater/view.py
+ extensions/deviceicon/battery.py
+ extensions/deviceicon/network.py
++extensions/deviceicon/resources.py
+ extensions/deviceicon/speaker.py
+ extensions/deviceicon/touchpad.py
+ extensions/deviceicon/volume.py
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0016-set-default-scaling-to-100.patch.patch b/rpms/sugar/0016-set-default-scaling-to-100.patch.patch
new file mode 100644
index 0000000..9c58df7
--- /dev/null
+++ b/rpms/sugar/0016-set-default-scaling-to-100.patch.patch
@@ -0,0 +1,25 @@
+From 5265fbe6b0e59eb00baaf7c1f04cc239689d698b Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 17:49:50 +0100
+Subject: [PATCH sugar 16/74] set-default-scaling-to-100.patch
+
+---
+ bin/sugar.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/sugar.in b/bin/sugar.in
+index 12098db..d6295bf 100644
+--- a/bin/sugar.in
++++ b/bin/sugar.in
+@@ -42,7 +42,7 @@ if test -z "$SUGAR_PROFILE"; then
+ fi
+ 
+ if test -z "$SUGAR_SCALING"; then
+-    export SUGAR_SCALING=72
++    export SUGAR_SCALING=100
+ fi
+ 
+ export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0017-Add-font-dpi-schema.patch b/rpms/sugar/0017-Add-font-dpi-schema.patch
new file mode 100644
index 0000000..858b332
--- /dev/null
+++ b/rpms/sugar/0017-Add-font-dpi-schema.patch
@@ -0,0 +1,34 @@
+From cd0ea7bfa330b45351a9aa61c85b39dfc376bf8d Mon Sep 17 00:00:00 2001
+From: Jorge Saldivar <jsaldivar@paraguayeduca.org>
+Date: Fri, 18 Jun 2010 13:02:46 -0400
+Subject: [PATCH sugar 17/74] Add font dpi schema
+
+---
+ data/sugar.schemas.in |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 8b3e1ad..c9bc7fe 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -260,6 +260,17 @@
+         <long>Font size that is used throughout the desktop.</long>
+       </locale>
+     </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/font/dpi</key>
++      <applyto>/desktop/sugar/font/dpi</applyto>
++      <owner>sugar</owner>
++      <type>int</type>
++      <default>200</default>
++      <locale name="C">
++        <short>Default font dpi</short>
++        <long>Font dpi that is used throughout the desktop.</long>
++      </locale>
++    </schema>
+ 
+     <schema>
+       <key>/schemas/desktop/sugar/i18n/langpackdir</key>
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0018-Change-the-method-to-add-new-actitivities-in-the-act.patch b/rpms/sugar/0018-Change-the-method-to-add-new-actitivities-in-the-act.patch
new file mode 100644
index 0000000..fe9b7ed
--- /dev/null
+++ b/rpms/sugar/0018-Change-the-method-to-add-new-actitivities-in-the-act.patch
@@ -0,0 +1,26 @@
+From f5aee59dea8bb3c11cd67a9faa48d18afbd34cbc Mon Sep 17 00:00:00 2001
+From: Jorge Saldivar <jsaldivar@paraguayeduca.org>
+Date: Thu, 1 Jul 2010 17:39:24 -0400
+Subject: [PATCH sugar 18/74] Change the method to add new actitivities in the
+ activities list in home view
+
+---
+ src/jarabe/desktop/activitieslist.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
+index b3b1f9d..44b0725 100644
+--- a/src/jarabe/desktop/activitieslist.py
++++ b/src/jarabe/desktop/activitieslist.py
+@@ -222,7 +222,7 @@ def _add_activity(self, activity_info):
+                     '<span style="italic" weight="light">%s</span>' % \
+                             (activity_info.get_name(), tags)
+ 
+-        self._model.append([activity_info.get_bundle_id(),
++        self._model.prepend([activity_info.get_bundle_id(),
+                             favorite,
+                             activity_info.get_icon(),
+                             title,
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0019-Journal-Volumes-Backup-and-Restore.patch b/rpms/sugar/0019-Journal-Volumes-Backup-and-Restore.patch
new file mode 100644
index 0000000..4b1594a
--- /dev/null
+++ b/rpms/sugar/0019-Journal-Volumes-Backup-and-Restore.patch
@@ -0,0 +1,700 @@
+From a0a18343e1823367813de3ec3cea579202ae5ea4 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Tue, 22 Jun 2010 15:59:13 -0400
+Subject: [PATCH sugar 19/74] Journal Volumes Backup and Restore
+
+Add a basic backup and restore feature for the Sugar Journal.
+It provides:
+
+- Generic Backup and Restore dialog GUI.
+- Process manager class as an abstraction layer between the dialog and
+  backup/restore scripts. (Allowing to work with many backup and restore
+  technologies, using the same GUI, with no need for script rewrite).
+- Basic file system Volume Restore and Backup scripts implemented in Python.
+- New backup and restore options for journal volumes palettes.
+
+This patch is based on Esteban Arias (Plan Ceibal) Volume Backup and Restore
+patch, with a few changes:
+
+- Refactor original Backup dialog class into a generic dialog class.
+- Create specialized VolumeBackupDialog and VolumeRestoreDialog subclasses.
+- Rewrite backup and restore scripts in python for an easier sugar interaction.
+- Add backup identification helpers to jarabe.journal.misc.
+---
+ bin/Makefile.am                       |    4 +-
+ bin/journal-backup-volume             |   57 ++++++++
+ bin/journal-restore-volume            |   67 +++++++++
+ src/jarabe/journal/Makefile.am        |    3 +-
+ src/jarabe/journal/misc.py            |   27 ++++
+ src/jarabe/journal/processdialog.py   |  248 +++++++++++++++++++++++++++++++++
+ src/jarabe/journal/volumestoolbar.py  |    4 +-
+ src/jarabe/model/Makefile.am          |    1 +
+ src/jarabe/model/processmanagement.py |   98 +++++++++++++
+ src/jarabe/view/palettes.py           |   44 ++++++
+ 10 files changed, 549 insertions(+), 4 deletions(-)
+ create mode 100644 bin/journal-backup-volume
+ create mode 100644 bin/journal-restore-volume
+ create mode 100644 src/jarabe/journal/processdialog.py
+ create mode 100644 src/jarabe/model/processmanagement.py
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 05a9215..65aab9b 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -5,7 +5,9 @@ python_scripts =		\
+ 	sugar-install-bundle	\
+ 	sugar-launch		\
+ 	sugar-session		\
+-	sugar-ui-check
++	sugar-ui-check		\
++	journal-backup-volume	\
++	journal-restore-volume
+ 
+ bin_SCRIPTS = 			\
+ 	sugar			\
+diff --git a/bin/journal-backup-volume b/bin/journal-backup-volume
+new file mode 100644
+index 0000000..9246760
+--- /dev/null
++++ b/bin/journal-backup-volume
+@@ -0,0 +1,57 @@
++#!/usr/bin/env python
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++import os
++import sys
++import subprocess
++import logging
++
++from sugar import env
++#from sugar.datastore import datastore
++
++backup_identifier = sys.argv[2]
++volume_path = sys.argv[1]
++
++if len(sys.argv) != 3:
++    print 'Usage: %s <volume_path> <backup_identifier>' % sys.argv[0]
++    exit(1)
++
++logging.debug('Backup started')
++
++backup_path = os.path.join(volume_path, 'backup', backup_identifier)
++
++if not os.path.exists(backup_path):
++    os.makedirs(backup_path)
++
++#datastore.freeze()
++#subprocess.call(['pkill', '-9', '-f', 'python.*datastore-service'])
++
++result = 0
++try:
++    cmd = ['tar', '-C', env.get_profile_path(), '-czf', \
++           os.path.join(backup_path, 'datastore.tar.gz'), 'datastore']
++
++    subprocess.check_call(cmd)
++
++except Exception, e:
++    logging.error('Backup failed: %s', str(e))
++    result = 1
++
++#datastore.thaw()
++
++logging.debug('Backup finished')
++exit(result)
+diff --git a/bin/journal-restore-volume b/bin/journal-restore-volume
+new file mode 100644
+index 0000000..aa14ad0
+--- /dev/null
++++ b/bin/journal-restore-volume
+@@ -0,0 +1,67 @@
++#!/usr/bin/env python
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++import os
++import sys
++import shutil
++import logging
++import subprocess
++
++from sugar import env
++#from sugar.datastore import datastore
++
++backup_identifier = sys.argv[2]
++volume_path = sys.argv[1]
++
++if len(sys.argv) != 3:
++    print 'Usage: %s <volume_path> <backup_identifier>' % sys.argv[0]
++    exit(1)
++
++logging.debug('Restore started')
++
++journal_path = os.path.join(env.get_profile_path(), 'datastore')
++backup_path = os.path.join(volume_path, 'backup', backup_identifier, 'datastore.tar.gz')
++
++if not os.path.exists(backup_path):
++    logging.error('Could not find backup file %s', backup_path)
++    exit(1)
++
++#datastore.freeze()
++subprocess.call(['pkill', '-9', '-f', 'python.*datastore-service'])
++
++result = 0
++try:
++    if os.path.exists(journal_path):
++        shutil.rmtree(journal_path)
++
++    subprocess.check_call(['tar', '-C', env.get_profile_path(), '-xzf', backup_path])
++
++except Exception, e:
++    logging.error('Restore failed: %s', str(e))
++    result = 1
++
++try:
++  shutil.rmtree(os.path.join(journal_path, 'index'))
++  os.remove(os.path.join(journal_path, 'index_updated'))
++  os.remove(os.path.join(journal_path, 'version'))
++except:
++  logging.debug('Restore has no index files')
++
++#datastore.thaw()
++
++logging.debug('Restore finished')
++exit(result)
+diff --git a/src/jarabe/journal/Makefile.am b/src/jarabe/journal/Makefile.am
+index ba29062..f24dcfe 100644
+--- a/src/jarabe/journal/Makefile.am
++++ b/src/jarabe/journal/Makefile.am
+@@ -15,4 +15,5 @@ sugar_PYTHON =				\
+ 	model.py			\
+ 	objectchooser.py		\
+ 	palettes.py			\
+-	volumestoolbar.py
++	volumestoolbar.py			\
++	processdialog.py
+diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
+index 1431d5f..fac56ad 100644
+--- a/src/jarabe/journal/misc.py
++++ b/src/jarabe/journal/misc.py
+@@ -1,4 +1,5 @@
+ # Copyright (C) 2007, One Laptop Per Child
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -313,3 +314,29 @@ def get_icon_color(metadata):
+         return XoColor(client.get_string('/desktop/sugar/user/color'))
+     else:
+         return XoColor(metadata['icon-color'])
++
++def get_backup_identifier():
++    serial_number = get_xo_serial()
++    if serial_number is None:
++        serial_number = get_nick()
++    return serial_number
++
++def get_xo_serial():
++    path = '/ofw/serial-number'
++
++    if os.access(path, os.R_OK) == 0:
++        return None
++
++    file_descriptor = open(path, 'r')
++    content = file_descriptor.read()
++    file_descriptor.close()
++
++    if content:
++        return content.strip()
++    else:
++        logging.error('No serial number at %s', path)
++        return None
++
++def get_nick():
++    client = gconf.client_get_default()
++    return client.get_string("/desktop/sugar/user/nick")
+diff --git a/src/jarabe/journal/processdialog.py b/src/jarabe/journal/processdialog.py
+new file mode 100644
+index 0000000..b96abd9
+--- /dev/null
++++ b/src/jarabe/journal/processdialog.py
+@@ -0,0 +1,248 @@
++#!/usr/bin/env python
++# Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gtk
++import gobject
++import gconf
++import logging
++
++from gettext import gettext as _
++from sugar.graphics import style
++from sugar.graphics.icon import Icon
++from sugar.graphics.xocolor import XoColor
++
++from jarabe.journal import misc
++from jarabe.model import shell
++from jarabe.model import processmanagement
++from jarabe.model.session import get_session_manager
++
++class ProcessDialog(gtk.Window):
++
++    __gtype_name__ = 'SugarProcessDialog'
++
++    def __init__(self, process_script='', process_params=[], restart_after=True):
++
++        #FIXME: Workaround limitations of Sugar core modal handling
++        shell_model = shell.get_model()
++        shell_model.set_zoom_level(shell_model.ZOOM_HOME)
++
++        gtk.Window.__init__(self)
++
++        self._process_script = processmanagement.find_and_absolutize(process_script)
++        self._process_params = process_params
++        self._restart_after = restart_after
++        self._start_message = _('Running')
++        self._failed_message = _('Failed')
++        self._finished_message = _('Finished')
++
++        self.set_border_width(style.LINE_WIDTH)
++        width = gtk.gdk.screen_width()
++        height = gtk.gdk.screen_height()
++        self.set_size_request(width, height)
++        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
++        self.set_decorated(False)
++        self.set_resizable(False)
++        self.set_modal(True)
++
++        self._colored_box = gtk.EventBox()
++        self._colored_box.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
++        self._colored_box.show()
++
++        self._vbox = gtk.VBox()
++        self._vbox.set_spacing(style.DEFAULT_SPACING)
++        self._vbox.set_border_width(style.GRID_CELL_SIZE)
++
++        self._colored_box.add(self._vbox)
++        self.add(self._colored_box)
++
++        self._setup_information()
++        self._setup_progress_bar()
++        self._setup_options()
++
++        self._vbox.show()
++
++        self.connect("realize", self.__realize_cb)
++
++        self._process_management = processmanagement.ProcessManagement()
++        self._process_management.connect('process-management-running', self._set_status_updated)
++        self._process_management.connect('process-management-started', self._set_status_started)
++        self._process_management.connect('process-management-finished', self._set_status_finished)
++        self._process_management.connect('process-management-failed', self._set_status_failed)
++
++    def _setup_information(self):
++        client = gconf.client_get_default()
++        color = XoColor(client.get_string('/desktop/sugar/user/color'))
++
++        self._icon = Icon(icon_name='activity-journal', pixel_size=style.XLARGE_ICON_SIZE, xo_color=color)
++        self._icon.show()
++
++        self._vbox.pack_start(self._icon, False)
++
++        self._title = gtk.Label()
++        self._title.modify_fg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color())
++        self._title.set_use_markup(True)
++        self._title.set_justify(gtk.JUSTIFY_CENTER)
++        self._title.show()
++
++        self._vbox.pack_start(self._title, False)
++
++        self._message = gtk.Label()
++        self._message.modify_fg(gtk.STATE_NORMAL, style.COLOR_BLACK.get_gdk_color())
++        self._message.set_use_markup(True)
++        self._message.set_line_wrap(True)
++        self._message.set_justify(gtk.JUSTIFY_CENTER)
++        self._message.show()
++
++        self._vbox.pack_start(self._message, True)
++
++    def _setup_options(self):
++        hbox = gtk.HBox(True, 3)
++        hbox.show()
++
++        icon = Icon(icon_name='dialog-ok')
++
++        self._start_button = gtk.Button()
++        self._start_button.set_image(icon)
++        self._start_button.set_label(_('Start'))
++        self._start_button.connect('clicked', self.__start_cb)
++        self._start_button.show()
++
++        icon = Icon(icon_name='dialog-cancel')
++
++        self._close_button = gtk.Button()
++        self._close_button.set_image(icon)
++        self._close_button.set_label(_('Cancel'))
++        self._close_button.connect('clicked', self.__close_cb)
++        self._close_button.show()
++
++        icon = Icon(icon_name='system-restart')
++
++        self._restart_button = gtk.Button()
++        self._restart_button.set_image(icon)
++        self._restart_button.set_label(_('Restart'))
++        self._restart_button.connect('clicked', self.__restart_cb)
++        self._restart_button.hide()
++
++        hbox.add(self._start_button)
++        hbox.add(self._close_button)
++        hbox.add(self._restart_button)
++
++        halign = gtk.Alignment(1, 0, 0, 0)
++        halign.show()
++        halign.add(hbox)
++
++        self._vbox.pack_start(halign, False, False, 3)
++
++    def _setup_progress_bar(self):
++        alignment = gtk.Alignment(xalign=0.5, yalign=0.5, xscale=0.5)
++        alignment.show()
++
++        self._progress_bar = gtk.ProgressBar(adjustment=None)
++        self._progress_bar.hide()
++
++        alignment.add(self._progress_bar)
++        self._vbox.pack_start(alignment)
++
++    def __realize_cb(self, widget):
++        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
++        self.window.set_accept_focus(True)
++
++    def __close_cb(self, button):
++        self.destroy()
++
++    def __start_cb(self, button):
++        self._process_management.do_process([self._process_script] + self._process_params)
++
++    def __restart_cb(self, button):
++        session_manager = get_session_manager()
++        session_manager.logout()
++
++    def _set_status_started(self, model, data=None):
++        self._message.set_markup(self._start_message)
++
++        self._start_button.hide()
++        self._close_button.hide()
++
++        self._progress_bar.set_fraction(0.05)
++        self._progress_bar_handler = gobject.timeout_add(1000, self.__progress_bar_handler_cb)
++        self._progress_bar.show()
++
++    def __progress_bar_handler_cb(self):
++        self._progress_bar.pulse()
++        return True
++
++    def _set_status_updated(self, model, data):
++        pass
++
++    def _set_status_finished(self, model, data=None):
++        self._message.set_markup(self._finished_message)
++
++        self._progress_bar.hide()
++        self._start_button.hide()
++
++        if self._restart_after:
++            self._restart_button.show()
++        else:
++            self._close_button.show()
++
++    def _set_status_failed(self, model, error_message=''):
++        self._message.set_markup('%s %s' % (self._failed_message, error_message))
++
++        self._progress_bar.hide()
++        self._start_button.show()
++        self._close_button.show()
++
++        logging.error(error_message)
++
++
++class VolumeBackupDialog(ProcessDialog):
++
++    def __init__(self, volume_path):
++        ProcessDialog.__init__(self, 'journal-backup-volume', \
++                              [volume_path, misc.get_backup_identifier()], restart_after=False)
++
++        self._resetup_information(volume_path)
++
++    def _resetup_information(self, volume_path):
++        self._start_message = '%s %s. \n\n' % (_('Please wait, saving Journal content to'), volume_path) + \
++                              '<big><b>%s</b></big>' % _('Do not remove the storage device!')
++
++        self._finished_message = _('The Journal content has been saved.')
++
++        self._title.set_markup('<big><b>%s</b></big>' % _('Backup'))
++
++        self._message.set_markup('%s %s' % (_('Journal content will be saved to'), volume_path))
++
++class VolumeRestoreDialog(ProcessDialog):
++
++    def __init__(self, volume_path):
++        ProcessDialog.__init__(self, 'journal-restore-volume', \
++                              [volume_path, misc.get_backup_identifier()])
++
++        self._resetup_information(volume_path)
++
++    def _resetup_information(self, volume_path):
++        self._start_message = '%s %s. \n\n' % (_('Please wait, restoring Journal content from'), volume_path) + \
++                              '<big><b>%s</b></big>' % _('Do not remove the storage device!')
++
++        self._finished_message = _('The Journal content has been restored.')
++
++        self._title.set_markup('<big><b>%s</b></big>' % _('Restore'))
++
++        self._message.set_markup('%s %s.\n\n' % (_('Journal content will be restored from'), volume_path) + \
++                                 '<big><b>%s</b> %s</big>' % (_('Warning:'), _('Current Journal content will be deleted!')))
++
+diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
+index 71b6ea8..48e25ec 100644
+--- a/src/jarabe/journal/volumestoolbar.py
++++ b/src/jarabe/journal/volumestoolbar.py
+@@ -36,7 +36,7 @@
+ from sugar import env
+ 
+ from jarabe.journal import model
+-from jarabe.view.palettes import VolumePalette
++from jarabe.view.palettes import JournalVolumePalette
+ 
+ 
+ _JOURNAL_0_METADATA_DIR = '.olpc.store'
+@@ -341,7 +341,7 @@ def __init__(self, mount):
+         self.props.xo_color = color
+ 
+     def create_palette(self):
+-        palette = VolumePalette(self._mount)
++        palette = JournalVolumePalette(self._mount)
+         #palette.props.invoker = FrameWidgetInvoker(self)
+         #palette.set_group_id('frame')
+         return palette
+diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
+index 92e8712..bd9bef2 100644
+--- a/src/jarabe/model/Makefile.am
++++ b/src/jarabe/model/Makefile.am
+@@ -12,6 +12,7 @@ sugar_PYTHON =			\
+ 	neighborhood.py		\
+         network.py              \
+         notifications.py        \
++	processmanagement.py	\
+ 	shell.py		\
+ 	screen.py		\
+         session.py		\
+diff --git a/src/jarabe/model/processmanagement.py b/src/jarabe/model/processmanagement.py
+new file mode 100644
+index 0000000..466e1f6
+--- /dev/null
++++ b/src/jarabe/model/processmanagement.py
+@@ -0,0 +1,98 @@
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
++# Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++import os
++import gobject
++import glib
++import gio
++
++from sugar import env
++from gettext import gettext as _
++
++BYTES_TO_READ = 100
++
++class ProcessManagement(gobject.GObject):
++
++    __gtype_name__ = 'ProcessManagement'
++
++    __gsignals__ = {
++        'process-management-running'    : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([str])),
++        'process-management-started'    : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
++        'process-management-finished'    : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
++        'process-management-failed'    : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([str]))
++    }
++
++    def __init__(self):
++        gobject.GObject.__init__(self)
++        self._running = False
++
++    def do_process(self, cmd):
++        self._run_cmd_async(cmd)
++
++    def _report_process_status(self, stream, result):
++        data = stream.read_finish(result)
++
++        if len(data):
++            self.emit('process-management-running', data)
++            stream.read_async(BYTES_TO_READ, self._report_process_status)
++
++    def _report_process_error(self, stream, result, concat_err=''):
++        data = stream.read_finish(result)
++        concat_err = concat_err + data
++
++        if len(data) == 0:
++                self.emit('process-management-failed', concat_err)
++        else:
++            stream.read_async(BYTES_TO_READ, self._report_process_error, user_data=concat_err)
++
++    def _notify_error(self, stderr):
++        stdin_stream = gio.unix.InputStream(stderr, True)
++        stdin_stream.read_async(BYTES_TO_READ, self._report_process_error)
++
++    def _notify_process_status(self, stdout):
++        stdin_stream = gio.unix.InputStream(stdout, True)
++        stdin_stream.read_async(BYTES_TO_READ, self._report_process_status)
++
++    def _run_cmd_async(self, cmd):
++        if self._running == False:
++            try:
++                pid, stdin, stdout, stderr = glib.spawn_async(cmd, flags=glib.SPAWN_DO_NOT_REAP_CHILD, standard_output=True, standard_error=True)
++                gobject.child_watch_add(pid, _handle_process_end, (self, stderr))
++            except Exception:
++                self.emit('process-management-failed', _("Error - Call process: ") + str(cmd))
++            else:
++                self._notify_process_status(stdout)
++                self._running  = True
++                self.emit('process-management-started')
++
++def _handle_process_end(pid, condition, (myself, stderr)):
++    myself._running = False
++
++    if os.WIFEXITED(condition) and\
++        os.WEXITSTATUS(condition) == 0:
++            myself.emit('process-management-finished')
++    else:
++        myself._notify_error(stderr)
++
++def find_and_absolutize(script_name):
++    paths = env.os.environ['PATH'].split(':')
++    for path in paths:
++        looking_path =  path + '/' + script_name
++        if env.os.path.isfile(looking_path):
++            return looking_path
++
++    return None
+diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
+index 3195c0c..a9e3629 100644
+--- a/src/jarabe/view/palettes.py
++++ b/src/jarabe/view/palettes.py
+@@ -1,4 +1,6 @@
+ # Copyright (C) 2008 One Laptop Per Child
++# Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
++# Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -31,6 +33,7 @@
+ from sugar.graphics.xocolor import XoColor
+ from sugar.activity.i18n import pgettext
+ 
++from jarabe.journal.processdialog import VolumeBackupDialog, VolumeRestoreDialog
+ from jarabe.model import shell
+ from jarabe.view.viewsource import setup_view_source
+ from jarabe.journal import misc
+@@ -253,3 +256,44 @@ def __popup_cb(self, palette):
+         self._progress_bar.props.fraction = fraction
+         self._free_space_label.props.label = _('%(free_space)d MB Free') % \
+                 {'free_space': free_space / (1024 * 1024)}
++
++
++class JournalVolumePalette(VolumePalette):
++
++    __gtype_name__ = 'JournalVolumePalette'
++
++    def __init__(self, mount):
++        VolumePalette.__init__(self, mount)
++
++        journal_separator = gtk.SeparatorMenuItem()
++        journal_separator.show()
++
++        self.menu.prepend(journal_separator)
++
++        icon = Icon(icon_name='transfer-from', icon_size=gtk.ICON_SIZE_MENU)
++        icon.show()
++
++        menu_item_journal_restore = MenuItem(_('Restore Journal'))
++        menu_item_journal_restore.set_image(icon)
++        menu_item_journal_restore.connect('activate', self.__journal_restore_activate_cb, mount.get_root().get_path())
++        menu_item_journal_restore.show()
++
++        self.menu.prepend(menu_item_journal_restore)
++
++        icon = Icon(icon_name='transfer-to', icon_size=gtk.ICON_SIZE_MENU)
++        icon.show()
++
++        menu_item_journal_backup = MenuItem(_('Backup Journal'))
++        menu_item_journal_backup.set_image(icon)
++        menu_item_journal_backup.connect('activate', self.__journal_backup_activate_cb, mount.get_root().get_path())
++        menu_item_journal_backup.show()
++
++        self.menu.prepend(menu_item_journal_backup)
++
++    def __journal_backup_activate_cb(self, menu_item, mount_path):
++        dialog = VolumeBackupDialog(mount_path)
++        dialog.show()
++
++    def __journal_restore_activate_cb(self, menu_item, mount_path):
++        dialog = VolumeRestoreDialog(mount_path)
++        dialog.show()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0020-Journal-XS-backup-and-restore.patch b/rpms/sugar/0020-Journal-XS-backup-and-restore.patch
new file mode 100644
index 0000000..9d253ee
--- /dev/null
+++ b/rpms/sugar/0020-Journal-XS-backup-and-restore.patch
@@ -0,0 +1,213 @@
+From b7560ab35c80232c3c5b223207e5f4a4259f24b5 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Wed, 23 Jun 2010 17:12:59 -0400
+Subject: [PATCH sugar 20/74] Journal XS backup and restore
+
+Include a new journal volumes toolbar icon. The icon represents
+the schoolserver. The icon palette provides a backup and restore
+options.
+---
+ src/jarabe/desktop/favoritesview.py  |    2 +
+ src/jarabe/journal/processdialog.py  |   30 ++++++++++++++++++++++++
+ src/jarabe/journal/volumestoolbar.py |   39 +++++++++++++++++++++++++++++--
+ src/jarabe/view/palettes.py          |   41 +++++++++++++++++++++++++++++++++-
+ 4 files changed, 108 insertions(+), 4 deletions(-)
+
+diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
+index 132d14f..75795cd 100644
+--- a/src/jarabe/desktop/favoritesview.py
++++ b/src/jarabe/desktop/favoritesview.py
+@@ -41,6 +41,7 @@
+ from jarabe.model.buddy import get_owner_instance
+ from jarabe.model import shell
+ from jarabe.model import bundleregistry
++from jarabe.journal.journalactivity import get_journal
+ from jarabe.journal import misc
+ 
+ from jarabe.desktop import schoolserver
+@@ -342,6 +343,7 @@ def __register_activate_cb(self, icon):
+             alert.props.msg = _('You are now registered ' \
+                                 'with your school server.')
+             self._my_icon.set_registered()
++            get_journal()._volumes_toolbar.setup_xs_button()
+ 
+         ok_icon = Icon(icon_name='dialog-ok')
+         alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
+diff --git a/src/jarabe/journal/processdialog.py b/src/jarabe/journal/processdialog.py
+index b96abd9..08c6d11 100644
+--- a/src/jarabe/journal/processdialog.py
++++ b/src/jarabe/journal/processdialog.py
+@@ -246,3 +246,33 @@ def _resetup_information(self, volume_path):
+         self._message.set_markup('%s %s.\n\n' % (_('Journal content will be restored from'), volume_path) + \
+                                  '<big><b>%s</b> %s</big>' % (_('Warning:'), _('Current Journal content will be deleted!')))
+ 
++class XSBackupDialog(ProcessDialog):
++
++    def __init__(self, xs_hostname):
++        ProcessDialog.__init__(self, 'journal-backup')
++        self._resetup_information(xs_hostname)
++
++    def _resetup_information(self, xs_hostname):
++        self._start_message = '%s %s.' % (_('Please wait, saving Journal content to'), xs_hostname)
++
++        self._finished_message = _('The journal content has been saved.')
++
++        self._title.set_markup('<big><b>%s</b></big>' % _('Backup'))
++
++        self._message.set_text('%s %s.' % (_('Journal content will be saved to'), xs_hostname))
++
++class XSRestoreDialog(ProcessDialog):
++
++    def __init__(self, xs_hostname):
++        ProcessDialog.__init__(self, 'journal-restore')
++        self._resetup_information(xs_hostname)
++
++    def _resetup_information(self, xs_hostname):
++        self._start_message = '%s %s.' % (_('Please wait, restoring journal content from'), xs_hostname)
++
++        self._finished_message = _('The journal content has been restored.')
++
++        self._title.set_markup('<big><b>%s</b></big>' % _('Restore'))
++
++        self._message.set_text('%s %s.' % (_('Journal content will be restored from'), xs_hostname))
++
+diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
+index 48e25ec..1356099 100644
+--- a/src/jarabe/journal/volumestoolbar.py
++++ b/src/jarabe/journal/volumestoolbar.py
+@@ -30,13 +30,15 @@
+ import tempfile
+ import shutil
+ 
++from sugar.graphics.toolbutton import ToolButton
+ from sugar.graphics.radiotoolbutton import RadioToolButton
++from sugar.graphics.icon import Icon
+ from sugar.graphics.palette import Palette
+ from sugar.graphics.xocolor import XoColor
+ from sugar import env
+ 
+ from jarabe.journal import model
+-from jarabe.view.palettes import JournalVolumePalette
++from jarabe.view.palettes import JournalVolumePalette, JournalXSPalette
+ 
+ 
+ _JOURNAL_0_METADATA_DIR = '.olpc.store'
+@@ -182,6 +184,7 @@ def __init__(self):
+ 
+         self.connect('destroy', self.__destroy_cb)
+ 
++        self.setup_xs_button()
+         gobject.idle_add(self._set_up_volumes)
+ 
+     def __destroy_cb(self, widget):
+@@ -189,6 +192,21 @@ def __destroy_cb(self, widget):
+         volume_monitor.disconnect(self._mount_added_hid)
+         volume_monitor.disconnect(self._mount_removed_hid)
+ 
++    def setup_xs_button(self):
++        client = gconf.client_get_default()
++        backup_url = client.get_string('/desktop/sugar/backup_url')
++
++        if backup_url:
++            xs_button = XSButton()
++            xs_button.set_palette(JournalXSPalette(backup_url))
++            #xs_button.props.group = self._volume_buttons[0]
++            xs_button.show()
++
++            self._volume_buttons.append(xs_button)
++            position = len(self._volume_buttons) - 1
++            self.insert(xs_button, position)
++            self.show()
++
+     def _set_up_volumes(self):
+         self._set_up_documents_button()
+ 
+@@ -260,8 +278,9 @@ def __unmount_cb(self, source, result):
+     def _get_button_for_mount(self, mount):
+         mount_point = mount.get_root().get_path()
+         for button in self.get_children():
+-            if button.mount_point == mount_point:
+-                return button
++            if type(button) == VolumeButton and \
++                button.mount_point == mount_point:
++                    return button
+         logging.error('Couldnt find button with mount_point %r', mount_point)
+         return None
+ 
+@@ -402,3 +421,17 @@ def __init__(self, documents_path):
+         client = gconf.client_get_default()
+         color = XoColor(client.get_string('/desktop/sugar/user/color'))
+         self.props.xo_color = color
++
++
++class XSButton(ToolButton):
++    def __init__(self):
++        ToolButton.__init__(self)
++        self.set_icon('school-server')
++
++    def set_icon(self, icon_name):
++        client = gconf.client_get_default()
++        color = XoColor(client.get_string('/desktop/sugar/user/color'))
++        icon = Icon(icon_name=icon_name, xo_color=color, icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR)
++        icon.show()
++
++        self.set_icon_widget(icon)
+diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
+index a9e3629..02648b7 100644
+--- a/src/jarabe/view/palettes.py
++++ b/src/jarabe/view/palettes.py
+@@ -33,7 +33,7 @@
+ from sugar.graphics.xocolor import XoColor
+ from sugar.activity.i18n import pgettext
+ 
+-from jarabe.journal.processdialog import VolumeBackupDialog, VolumeRestoreDialog
++from jarabe.journal.processdialog import VolumeBackupDialog, VolumeRestoreDialog, XSBackupDialog, XSRestoreDialog
+ from jarabe.model import shell
+ from jarabe.view.viewsource import setup_view_source
+ from jarabe.journal import misc
+@@ -297,3 +297,42 @@ def __journal_backup_activate_cb(self, menu_item, mount_path):
+     def __journal_restore_activate_cb(self, menu_item, mount_path):
+         dialog = VolumeRestoreDialog(mount_path)
+         dialog.show()
++
++
++class JournalXSPalette(Palette):
++    def __init__(self, xs_hostname):
++        Palette.__init__(self, _('School Server'))
++
++        self.props.secondary_text = xs_hostname
++
++        vbox = gtk.VBox()
++        self.set_content(vbox)
++        vbox.show()
++
++        icon = Icon(icon_name='transfer-to', icon_size=gtk.ICON_SIZE_MENU)
++        icon.show()
++
++        menu_item_journal_backup = MenuItem(_('Backup Journal'))
++        menu_item_journal_backup.set_image(icon)
++        menu_item_journal_backup.connect('activate', self.__journal_backup_activate_cb, xs_hostname)
++        menu_item_journal_backup.show()
++
++        self.menu.append(menu_item_journal_backup)
++
++        icon = Icon(icon_name='transfer-from', icon_size=gtk.ICON_SIZE_MENU)
++        icon.show()
++
++        menu_item_journal_restore = MenuItem(_('Restore Journal'))
++        menu_item_journal_restore.set_image(icon)
++        menu_item_journal_restore.connect('activate', self.__journal_restore_activate_cb, xs_hostname)
++        menu_item_journal_restore.show()
++
++        self.menu.append(menu_item_journal_restore)
++
++    def __journal_backup_activate_cb(self, menu_item, xs_hostname):
++        dialog = XSBackupDialog(xs_hostname)
++        dialog.show()
++
++    def __journal_restore_activate_cb(self, menu_item, xs_hostname):
++        dialog = XSRestoreDialog(xs_hostname)
++        dialog.show()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0021-Processdialog-prerequisite-check-support.patch b/rpms/sugar/0021-Processdialog-prerequisite-check-support.patch
new file mode 100644
index 0000000..eb21667
--- /dev/null
+++ b/rpms/sugar/0021-Processdialog-prerequisite-check-support.patch
@@ -0,0 +1,88 @@
+From aa883ed6be6ef81692cf92f0ead21954331a6081 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Thu, 29 Jul 2010 17:20:45 -0400
+Subject: [PATCH sugar 21/74] Processdialog prerequisite check support
+
+---
+ src/jarabe/journal/processdialog.py |   23 ++++++++++++++++++++---
+ 1 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/src/jarabe/journal/processdialog.py b/src/jarabe/journal/processdialog.py
+index 08c6d11..181174d 100644
+--- a/src/jarabe/journal/processdialog.py
++++ b/src/jarabe/journal/processdialog.py
+@@ -48,6 +48,7 @@ def __init__(self, process_script='', process_params=[], restart_after=True):
+         self._start_message = _('Running')
+         self._failed_message = _('Failed')
+         self._finished_message = _('Finished')
++        self._prerequisite_message = ('Prerequisites were not met')
+ 
+         self.set_border_width(style.LINE_WIDTH)
+         width = gtk.gdk.screen_width()
+@@ -125,7 +126,7 @@ def _setup_options(self):
+ 
+         self._close_button = gtk.Button()
+         self._close_button.set_image(icon)
+-        self._close_button.set_label(_('Cancel'))
++        self._close_button.set_label(_('Close'))
+         self._close_button.connect('clicked', self.__close_cb)
+         self._close_button.show()
+ 
+@@ -165,12 +166,18 @@ def __close_cb(self, button):
+         self.destroy()
+ 
+     def __start_cb(self, button):
+-        self._process_management.do_process([self._process_script] + self._process_params)
++        if self._check_prerequisites():
++            self._process_management.do_process([self._process_script] + self._process_params)
++        else:
++            self._set_status_failed(self, error_message=self._prerequisite_message)
+ 
+     def __restart_cb(self, button):
+         session_manager = get_session_manager()
+         session_manager.logout()
+ 
++    def _check_prerequisites(self):
++        return True
++
+     def _set_status_started(self, model, data=None):
+         self._message.set_markup(self._start_message)
+ 
+@@ -199,12 +206,13 @@ def _set_status_finished(self, model, data=None):
+         else:
+             self._close_button.show()
+ 
+-    def _set_status_failed(self, model, error_message=''):
++    def _set_status_failed(self, model=None, error_message=''):
+         self._message.set_markup('%s %s' % (self._failed_message, error_message))
+ 
+         self._progress_bar.hide()
+         self._start_button.show()
+         self._close_button.show()
++        self._restart_button.hide()
+ 
+         logging.error(error_message)
+ 
+@@ -246,6 +254,11 @@ def _resetup_information(self, volume_path):
+         self._message.set_markup('%s %s.\n\n' % (_('Journal content will be restored from'), volume_path) + \
+                                  '<big><b>%s</b> %s</big>' % (_('Warning:'), _('Current Journal content will be deleted!')))
+ 
++        self._prerequisite_message = _(', please close all the running activities.')
++
++    def _check_prerequisites(self):
++        return len(shell.get_model()) <= 1
++
+ class XSBackupDialog(ProcessDialog):
+ 
+     def __init__(self, xs_hostname):
+@@ -276,3 +289,7 @@ def _resetup_information(self, xs_hostname):
+ 
+         self._message.set_text('%s %s.' % (_('Journal content will be restored from'), xs_hostname))
+ 
++        self._prerequisite_message = _(', please close all the running activities.')
++
++    def _check_prerequisites(self):
++        return len(shell.get_model()) <= 1
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0022-Journal-Backup-save-lease.patch b/rpms/sugar/0022-Journal-Backup-save-lease.patch
new file mode 100644
index 0000000..7dbc7c8
--- /dev/null
+++ b/rpms/sugar/0022-Journal-Backup-save-lease.patch
@@ -0,0 +1,37 @@
+From ad40835c07112c886bdf404cfd7eae4f14d75626 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Tue, 13 Jul 2010 11:02:27 -0400
+Subject: [PATCH sugar 22/74] Journal Backup save lease
+
+This feature was requested by Caacupe CATS.
+---
+ bin/journal-backup-volume |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/bin/journal-backup-volume b/bin/journal-backup-volume
+index 9246760..7c5d32a 100644
+--- a/bin/journal-backup-volume
++++ b/bin/journal-backup-volume
+@@ -23,6 +23,7 @@ import logging
+ from sugar import env
+ #from sugar.datastore import datastore
+ 
++lease_path = '/security/lease.sig'
+ backup_identifier = sys.argv[2]
+ volume_path = sys.argv[1]
+ 
+@@ -37,6 +38,11 @@ backup_path = os.path.join(volume_path, 'backup', backup_identifier)
+ if not os.path.exists(backup_path):
+     os.makedirs(backup_path)
+ 
++# Save activation file
++if os.path.isfile(lease_path):
++    lease_content =  open(lease_path).read()
++    open(os.path.join(volume_path, 'lease.sig'), 'a+').write(lease_content)
++
+ #datastore.freeze()
+ #subprocess.call(['pkill', '-9', '-f', 'python.*datastore-service'])
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0023-backup-translations.patch.patch b/rpms/sugar/0023-backup-translations.patch.patch
new file mode 100644
index 0000000..db3f0d8
--- /dev/null
+++ b/rpms/sugar/0023-backup-translations.patch.patch
@@ -0,0 +1,109 @@
+From ce7f28ee6bc5ec4dc9c8a897f17de22f18aeea77 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:26:05 +0100
+Subject: [PATCH sugar 23/74] backup-translations.patch
+
+---
+ po/es.po |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 70 insertions(+), 2 deletions(-)
+
+diff --git a/po/es.po b/po/es.po
+index 83b28d3..474d28f 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1210,7 +1210,7 @@ msgid "%s of %s"
+ msgstr "%s de %s"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:558
+-#, python-format, 
++#, python-format,
+ msgid "Transfer from %s"
+ msgstr "Transferencia desde %s"
+ 
+@@ -1235,7 +1235,7 @@ msgid "The other participant canceled the file transfer"
+ msgstr "El otro participante canceló la transferencia del archivo"
+ 
+ #: ../src/jarabe/frame/activitiestray.py:691
+-#, python-format, 
++#, python-format,
+ msgid "Transfer to %s"
+ msgstr "Transferir a %s"
+ 
+@@ -1820,6 +1820,74 @@ msgstr "Ver código fuente: %r"
+ msgid "Sugar in a window"
+ msgstr "Sugar en una ventana"
+ 
++#: ../src/jarabe/journal/processdialog.py:48
++msgid "Running"
++msgstr "Corriendo"
++
++#: ../src/jarabe/journal/processdialog.py:49
++msgid "Failed"
++msgstr "Fracasado"
++
++#: ../src/jarabe/journal/processdialog.py:50
++msgid "Finished"
++msgstr "Finalizado"
++
++#: ../src/jarabe/journal/processdialog.py:221
++msgid "Please wait, saving Journal content to"
++msgstr "Espere por favor, guardando el contenido del Diario a"
++
++#: ../src/jarabe/journal/processdialog.py:222
++msgid "Do not remove the storage device!"
++msgstr "¡No quite el dispositivo de almacenamiento!"
++
++#: ../src/jarabe/journal/processdialog.py:224
++msgid "The Journal content has been saved."
++msgstr "El contenido del Diario se ha guardado."
++
++#: ../src/jarabe/journal/processdialog.py:226
++msgid "Backup"
++msgstr "Respaldar"
++
++#: ../src/jarabe/journal/processdialog.py:228
++msgid "Journal content will be saved to"
++msgstr "El contenido del Diario se guardará en"
++
++#: ../src/jarabe/journal/processdialog.py:239
++msgid "Please wait, restoring Journal content from"
++msgstr "Espere por favor, restaurando el contenido del Diario desde"
++
++#: ../src/jarabe/journal/processdialog.py:242
++msgid "The Journal content has been restored."
++msgstr "El contenido del Diario se ha restaurado."
++
++#: ../src/jarabe/journal/processdialog.py:244
++msgid "Restore"
++msgstr "Restaurar"
++
++#: ../src/jarabe/view/palettes.py:246
++msgid "Journal content will be restored from"
++msgstr "El contenido del Diario será restaurado desde"
++
++#: ../src/jarabe/journal/processdialog.py:247
++msgid "Warning:"
++msgstr "Advertencia:"
++
++#: ../src/jarabe/journal/processdialog.py:247
++msgid "Current Journal content will be deleted!"
++msgstr "¡El contenido actual del Diario será eliminado!"
++
++#: ../src/jarabe/view/palettes.py:280
++msgid "Restore Journal"
++msgstr "Restaurar Diario"
++
++#: ../src/jarabe/view/palettes.py:290
++msgid "Backup Journal"
++msgstr "Respaldar Diario"
++
++#: ../src/jarabe/view/palettes.py:307
++msgid "School Server"
++msgstr "Servidor Escuela"
++
+ # 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
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0024-accessibility_0001_cp_accessibility_keyboard.patch.patch b/rpms/sugar/0024-accessibility_0001_cp_accessibility_keyboard.patch.patch
new file mode 100644
index 0000000..67b1f2e
--- /dev/null
+++ b/rpms/sugar/0024-accessibility_0001_cp_accessibility_keyboard.patch.patch
@@ -0,0 +1,523 @@
+From 0ebe85157993bc1793488edbe479ed9149e5bf43 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 17:56:53 +0100
+Subject: [PATCH sugar 24/74] accessibility_0001_cp_accessibility_keyboard.patch
+
+---
+ bin/sugar-session                              |    7 ++
+ configure.ac                                   |    1 +
+ data/icons/Makefile.am                         |    1 +
+ data/icons/module-accessibility.svg            |   92 +++++++++++++++++++
+ extensions/cpsection/Makefile.am               |   15 +++-
+ extensions/cpsection/accessibility/Makefile.am |    6 ++
+ extensions/cpsection/accessibility/__init__.py |   25 +++++
+ extensions/cpsection/accessibility/model.py    |   55 +++++++++++
+ extensions/cpsection/accessibility/view.py     |  114 ++++++++++++++++++++++++
+ src/jarabe/model/Makefile.am                   |    1 +
+ src/jarabe/model/accessibility.py              |   76 ++++++++++++++++
+ 11 files changed, 391 insertions(+), 2 deletions(-)
+ create mode 100644 data/icons/module-accessibility.svg
+ create mode 100644 extensions/cpsection/accessibility/Makefile.am
+ create mode 100644 extensions/cpsection/accessibility/__init__.py
+ create mode 100644 extensions/cpsection/accessibility/model.py
+ create mode 100644 extensions/cpsection/accessibility/view.py
+ create mode 100644 src/jarabe/model/accessibility.py
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index 40c9db7..a1d7cac 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ # Copyright (C) 2006, Red Hat, Inc.
+ # Copyright (C) 2009, One Laptop Per Child Association Inc
++# Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -193,6 +194,7 @@ def bootstrap():
+     gobject.idle_add(setup_notification_service_cb)
+     gobject.idle_add(setup_file_transfer_cb)
+     gobject.idle_add(show_software_updates_cb)
++    gobject.idle_add(setup_accessibility_cb)
+ 
+     if sys.modules.has_key('xklavier'):
+         gobject.idle_add(setup_keyboard_cb)
+@@ -204,6 +206,11 @@ def set_fonts():
+     settings = gtk.settings_get_default()
+     settings.set_property("gtk-font-name", "%s %f" % (face, size))
+ 
++def setup_accessibility_cb():
++    from jarabe.model import accessibility
++    accessibility_manager = accessibility.AccessibilityManager()
++    accessibility_manager.setup_accessibility()
++
+ def main():
+     try:
+         from sugar import env
+diff --git a/configure.ac b/configure.ac
+index 237b2ad..df9614f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,6 +50,7 @@ data/icons/Makefile
+ data/Makefile
+ data/sugar-emulator.desktop
+ extensions/cpsection/aboutcomputer/Makefile
++extensions/cpsection/accessibility/Makefile
+ extensions/cpsection/aboutme/Makefile
+ extensions/cpsection/datetime/Makefile
+ extensions/cpsection/frame/Makefile
+diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
+index a35643a..2497c4a 100644
+--- a/data/icons/Makefile.am
++++ b/data/icons/Makefile.am
+@@ -3,6 +3,7 @@ sugardir = $(pkgdatadir)/data/icons
+ sugar_DATA =                        \
+ 	module-about_me.svg             \
+ 	module-about_my_computer.svg    \
++	module-accessibility.svg        \
+ 	module-date_and_time.svg        \
+ 	module-frame.svg                \
+ 	module-keyboard.svg             \
+diff --git a/data/icons/module-accessibility.svg b/data/icons/module-accessibility.svg
+new file mode 100644
+index 0000000..245a47e
+--- /dev/null
++++ b/data/icons/module-accessibility.svg
+@@ -0,0 +1,92 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   version="1.0"
++   width="55"
++   height="55"
++   id="svg795">
++  <defs
++     id="defs797" />
++  <g
++     id="layer1">
++    <path
++       d="m -23.738584,30.440666 a 8.901969,11.301082 0 1 1 -17.803937,0 8.901969,11.301082 0 1 1 17.803937,0 z"
++       transform="matrix(1.2765958,0,0,1.0558659,19.192898,-13.127946)"
++       id="path12"
++       style="fill:none;stroke:#ffffff" />
++    <path
++       d="m 30.145644,37.823484 c -0.583589,6.659344 -6.7511,11.52268 -13.775517,10.862567 C 9.3457054,48.02594 4.1243814,42.092348 4.7079694,35.433004 5.2915594,28.773661 20.67887,20.597949 14.885997,24.011638 -12.777062,40.313232 24.43362,62.068174 30.145644,37.823484 z"
++       id="path1405-0"
++       style="fill:none;stroke:#ffffff;stroke-width:1.44962609;stroke-opacity:1" />
++    <rect
++       width="2.916333"
++       height="21.188446"
++       ry="1.3939767"
++       x="18.332197"
++       y="13.76814"
++       id="rect1438-8"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50547338;stroke-opacity:1" />
++    <rect
++       width="2.8716421"
++       height="19.140917"
++       ry="1.259271"
++       x="-35.091366"
++       y="-38.207035"
++       transform="matrix(0,-1,-1,0,0,0)"
++       id="rect1438-1-87"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.41987956;stroke-opacity:1" />
++    <rect
++       width="2.5733202"
++       height="15.766372"
++       ry="1.0372615"
++       x="-5.4068875"
++       y="-65.997124"
++       transform="matrix(-0.55477829,0.83199823,-0.68762037,-0.72607041,0,0)"
++       id="rect1438-0-4"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.21988189;stroke-opacity:1" />
++    <rect
++       width="2.0588"
++       height="12.916228"
++       ry="0.84975183"
++       x="6.7647386"
++       y="-38.278324"
++       transform="matrix(-0.21998034,0.97550431,-0.88967727,-0.45658992,0,0)"
++       id="rect1438-0-1-8"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.98759735;stroke-opacity:1" />
++    <rect
++       width="0.98179615"
++       height="13.275604"
++       ry="0.87339497"
++       x="-30.243309"
++       y="-41.495876"
++       transform="matrix(0,-1,-1,0,0,0)"
++       id="rect1438-1-8-5"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.69142139;stroke-opacity:1" />
++    <rect
++       width="0.97070193"
++       height="11.568416"
++       ry="0.76108003"
++       x="50.822704"
++       y="-8.6089849"
++       transform="matrix(0.89791652,0.44016579,0.56230073,-0.82693282,0,0)"
++       id="rect1438-1-8-0-0"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.64177793;stroke-opacity:1" />
++    <rect
++       width="1.6299056"
++       height="7.7739253"
++       ry="0.51144254"
++       x="72.759727"
++       y="35.364716"
++       transform="matrix(0.9888174,0.14913131,-0.60877492,0.79334299,0,0)"
++       id="rect1438-0-1-7-7"
++       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.68172067;stroke-opacity:1" />
++    <path
++       d="m 79.67578,18.634508 a 3.2829957,3.0304577 0 1 1 -6.565992,0 3.2829957,3.0304577 0 1 1 6.565992,0 z"
++       transform="matrix(1.5397454,0,0,1.4719643,-97.932275,-17.750188)"
++       id="path1603-2"
++       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1" />
++  </g>
++</svg>
+diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
+index a92b5dd..d623380 100644
+--- a/extensions/cpsection/Makefile.am
++++ b/extensions/cpsection/Makefile.am
+@@ -1,5 +1,16 @@
+-SUBDIRS = aboutme aboutcomputer datetime frame keyboard language \
+-    modemconfiguration network power updater
++SUBDIRS = \
++	aboutme \
++	aboutcomputer \
++	accessibility \
++	datetime \
++	frame \
++	keyboard \
++	language \
++	modemconfiguration \
++	network \
++	power \
++	updater \
++	#
+ 
+ sugardir = $(pkgdatadir)/extensions/cpsection
+ sugar_PYTHON = __init__.py
+diff --git a/extensions/cpsection/accessibility/Makefile.am b/extensions/cpsection/accessibility/Makefile.am
+new file mode 100644
+index 0000000..70d26f4
+--- /dev/null
++++ b/extensions/cpsection/accessibility/Makefile.am
+@@ -0,0 +1,6 @@
++sugardir = $(pkgdatadir)/extensions/cpsection/accessibility
++
++sugar_PYTHON = 		\
++	__init__.py	\
++	model.py	\
++	view.py		
+diff --git a/extensions/cpsection/accessibility/__init__.py b/extensions/cpsection/accessibility/__init__.py
+new file mode 100644
+index 0000000..3467372
+--- /dev/null
++++ b/extensions/cpsection/accessibility/__init__.py
+@@ -0,0 +1,25 @@
++# Copyright (C) 2010 Plan Ceibal
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy 
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++from gettext import gettext as _
++
++CLASS = 'accessibility'
++ICON = 'module-accessibility'
++TITLE = _('Accessibility')
++
+diff --git a/extensions/cpsection/accessibility/model.py b/extensions/cpsection/accessibility/model.py
+new file mode 100644
+index 0000000..5136460
+--- /dev/null
++++ b/extensions/cpsection/accessibility/model.py
+@@ -0,0 +1,55 @@
++# Copyright (C) 2010 Plan Ceibal
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy 
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import subprocess
++import gconf
++
++from gettext import gettext as _
++from jarabe.model import accessibility
++
++keyboard = accessibility.Keyboard()
++
++KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys']
++
++def get_mouse_keys():
++    return keyboard.get_mouse_keys()
++
++def set_mouse_keys(activar):
++    keyboard.set_mouse_keys(activar)
++
++def print_mouse_keys():
++    print str(get_mouse_keys())
++
++def get_sticky_keys():    
++    return keyboard.get_sticky_keys()
++
++def set_sticky_keys(activar):
++    keyboard.set_sticky_keys(activar)
++
++def print_sticky_keys():
++    print str(get_sticky_keys())
++
++def get_bounce_keys():
++    return keyboard.get_bounce_keys()
++
++def set_bounce_keys(activar):
++    keyboard.set_bounce_keys(activar)
++
++def print_bounce_keys():
++    print str(get_bounce_keys())
+diff --git a/extensions/cpsection/accessibility/view.py b/extensions/cpsection/accessibility/view.py
+new file mode 100644
+index 0000000..9f291ac
+--- /dev/null
++++ b/extensions/cpsection/accessibility/view.py
+@@ -0,0 +1,114 @@
++# Copyright (C) 2010 Plan Ceibal
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy 
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++
++import gtk
++from gettext import gettext as _
++
++from sugar.graphics import style
++
++from jarabe import config
++from jarabe.controlpanel.sectionview import SectionView
++from jarabe.controlpanel.inlinealert import InlineAlert
++
++class accessibility(SectionView):
++    def __init__(self, model, alerts=None):
++        SectionView.__init__(self)
++
++        self._model = model
++        self.set_border_width(style.DEFAULT_SPACING * 2)
++        self.set_spacing(style.DEFAULT_SPACING)
++        group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
++     
++        separator_pm = gtk.HSeparator()
++        self.pack_start(separator_pm, expand=False)
++        separator_pm.show()
++
++        label_pm_teclado = gtk.Label(_('Keyboard'))
++        label_pm_teclado.set_alignment(0, 0)
++        self.pack_start(label_pm_teclado, expand=False)
++        label_pm_teclado.show()
++
++        self.box_pm = gtk.VBox()
++        self.box_pm.set_border_width(style.DEFAULT_SPACING * 2)
++        self.box_pm.set_spacing(style.DEFAULT_SPACING)       
++
++        self._view_mouse_keys()
++        self._view_sticky_keys()
++        self._view_bounce_keys()
++
++        self.pack_start(self.box_pm, expand=False)
++        self.box_pm.show()
++    
++    def _set_mouse_keys(self, widget):
++        state = widget.get_active()
++        self._model.set_mouse_keys(state)
++
++    def _set_sticky_keys(self, widget):
++        state = widget.get_active()
++        self._model.set_sticky_keys(state)
++
++    def _set_bounce_keys(self, widget):
++        state = widget.get_active()
++        self._model.set_bounce_keys(state)
++
++    def undo(self):
++        self._model.set_mouse_keys(self.init_state_mouse_keys)
++        self._model.set_sticky_keys(self.init_state_sticky_keys)
++        self._model.set_bounce_keys(self.init_state_bounce_keys)
++
++    def _view_mouse_keys(self):
++        self.btn_mouse_keys = gtk.CheckButton(_('Mouse Keys'))
++        self._mouse_pm_change_handler = self.btn_mouse_keys.connect("toggled", self._set_mouse_keys)
++        self.init_state_mouse_keys = self._model.get_mouse_keys() 
++        self.btn_mouse_keys.set_active(self.init_state_mouse_keys)            
++        self.box_pm.pack_start(self.btn_mouse_keys, True, True, 2)
++        self.btn_mouse_keys.show()
++
++        lbl_mouse = gtk.Label(_('Move the mouse pointer with keyboard number.'))
++        lbl_mouse.set_alignment(0, 0)
++        self.box_pm.pack_start(lbl_mouse, True, True, 2)
++        lbl_mouse.show()
++
++    def _view_sticky_keys(self):
++        self.btn_sticky_keys = gtk.CheckButton(_('Sticky Keys'))
++        self._sticky_pm_change_handler = self.btn_sticky_keys.connect("toggled", self._set_sticky_keys)
++        self.init_state_sticky_keys = self._model.get_sticky_keys()
++        self.btn_sticky_keys.set_active(self.init_state_sticky_keys)
++        self.box_pm.pack_start(self.btn_sticky_keys, True, True, 2)
++        self.btn_sticky_keys.show()
++
++        lbl_sticky = gtk.Label(_('Instead of having to press two keys at once (such as CTRL + Q), you can press one key at a time.'))
++        lbl_sticky.set_line_wrap(True)
++        lbl_sticky.set_alignment(0, 0)
++        self.box_pm.pack_start(lbl_sticky, True, True, 2)
++        lbl_sticky.show()
++
++    def _view_bounce_keys(self):
++        self.btn_bounce_keys = gtk.CheckButton(_('Bounce Keys'))
++        self._bounce_pm_change_handler = self.btn_bounce_keys.connect("toggled", self._set_bounce_keys)
++        self.init_state_bounce_keys = self._model.get_bounce_keys()
++        self.btn_bounce_keys.set_active(self.init_state_bounce_keys)
++        self.box_pm.pack_start(self.btn_bounce_keys, True, True, 2)
++        self.btn_bounce_keys.show()
++
++        lbl_bounce = gtk.Label(_('Ignore rapid, repeated keypresses of the same key.'))
++        lbl_bounce.set_alignment(0, 0)
++        self.box_pm.pack_start(lbl_bounce, True, True, 2)
++        lbl_bounce.show()
+diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
+index bd9bef2..ee8b865 100644
+--- a/src/jarabe/model/Makefile.am
++++ b/src/jarabe/model/Makefile.am
+@@ -2,6 +2,7 @@ sugardir = $(pythondir)/jarabe/model
+ sugar_PYTHON =			\
+ 	adhoc.py		\
+ 	__init__.py		\
++	accessibility.py	\
+ 	buddy.py		\
+ 	bundleregistry.py	\
+ 	filetransfer.py		\
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+new file mode 100644
+index 0000000..b851b3c
+--- /dev/null
++++ b/src/jarabe/model/accessibility.py
+@@ -0,0 +1,76 @@
++# Copyright (C) 2010 Plan Ceibal
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy 
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import subprocess
++import gconf
++
++from gettext import gettext as _
++
++class Keyboard:
++
++    def get_mouse_keys(self):
++        client = gconf.client_get_default()
++        return client.get_bool("/desktop/sugar/accessibility/keyboard/mousekeys_enable")
++
++    def set_mouse_keys(self, activar):
++        client = gconf.client_get_default()
++        client.set_bool("/desktop/sugar/accessibility/keyboard/mousekeys_enable", activar)
++        self.run_config_keyboard()
++
++    def get_sticky_keys(self):    
++        client = gconf.client_get_default()
++        return client.get_bool("/desktop/sugar/accessibility/keyboard/stickykeys_enable")
++
++    def set_sticky_keys(self, activar):
++        client = gconf.client_get_default()
++        client.set_bool("/desktop/sugar/accessibility/keyboard/stickykeys_enable", activar)
++        self.run_config_keyboard()
++
++    def get_bounce_keys(self):
++        client = gconf.client_get_default()
++        return client.get_bool("/desktop/sugar/accessibility/keyboard/bouncekeys_enable")
++
++    def set_bounce_keys(self, activar):
++        client = gconf.client_get_default()
++        client.set_bool("/desktop/sugar/accessibility/keyboard/bouncekeys_enable", activar)
++        self.run_config_keyboard()
++
++    def run_config_keyboard(self):
++        cmd = ['ax']
++        if self.get_sticky_keys():
++            cmd.append('+stickykeys')
++        else:
++            cmd.append('-stickykeys')
++        if self.get_bounce_keys():
++            cmd.append('+bouncekeys')
++        else:
++            cmd.append('-bouncekeys')
++        if self.get_mouse_keys():
++            cmd += ['+mousekeys', 'mousemaxspeed', '3000', 'mousetimetomax', '1000', '-timeout', '-repeatkeys']
++        else:
++            cmd += ['-mousekeys', 'mousemaxspeed', '3000', 'mousetimetomax', '1000', '+timeout', '+repeatkeys']
++        subprocess.call(cmd)
++
++class AccessibilityManager:
++    def setup_accessibility(self):
++        client = gconf.client_get_default()
++        is_accessibility = client.dir_exists("/desktop/sugar/accessibility")
++        if is_accessibility:
++            keyboard = Keyboard()
++            keyboard.run_config_keyboard()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0025-accessibility_0002_magnifier_extension.patch.patch b/rpms/sugar/0025-accessibility_0002_magnifier_extension.patch.patch
new file mode 100644
index 0000000..9a2a432
--- /dev/null
+++ b/rpms/sugar/0025-accessibility_0002_magnifier_extension.patch.patch
@@ -0,0 +1,127 @@
+From efd8f0a023902aae41d07bc576908e6b067e67aa Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 17:59:06 +0100
+Subject: [PATCH sugar 25/74] accessibility_0002_magnifier_extension.patch
+
+---
+ extensions/globalkey/Makefile.am  |    1 +
+ extensions/globalkey/magnifier.py |   96 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 97 insertions(+), 0 deletions(-)
+ create mode 100644 extensions/globalkey/magnifier.py
+
+diff --git a/extensions/globalkey/Makefile.am b/extensions/globalkey/Makefile.am
+index 69afac2..49a8dd7 100644
+--- a/extensions/globalkey/Makefile.am
++++ b/extensions/globalkey/Makefile.am
+@@ -2,5 +2,6 @@ sugardir = $(pkgdatadir)/extensions/globalkey
+ 
+ sugar_PYTHON = 		\
+ 	__init__.py	\
++	magnifier.py	\
+ 	screenshot.py	\
+ 	viewsource.py
+diff --git a/extensions/globalkey/magnifier.py b/extensions/globalkey/magnifier.py
+new file mode 100644
+index 0000000..c25d9e7
+--- /dev/null
++++ b/extensions/globalkey/magnifier.py
+@@ -0,0 +1,96 @@
++# Copyright (C) 2010 Plan Ceibal <comunidad@plan.ceibal.edu.uy>
++
++import os
++
++import ConfigParser
++import logging
++import gobject
++
++from jarabe.view.viewsource import setup_view_source
++from sugar import env
++
++
++PATH_VMG_CONFIG = os.environ['HOME'] + '/.magnifier.ini'
++BOUND_KEYS = ['<shift>F13', 'F13', '<control>F13']
++
++def handle_key_press(key):
++    logger = logging.getLogger('magnifier')
++    logger.setLevel(logging.DEBUG)
++    logger.debug("Ejecutando magnifier......" + key)
++    if (key=='<shift>F13'):
++        set_ruta_archivo()
++        set_GraphicsTools()
++    if (key=='<control>F13'):
++        set_ruta_archivo()
++        set_InvertColors()
++    _run_cmd_async('launchVmg')
++
++def get_GraphicsTools():
++    return leer_config('General', 'GraphicsTools')
++
++def set_GraphicsTools():
++    grabar_config_GraphicsTools('General', 'GraphicsTools')
++
++def grabar_config_GraphicsTools(encabezado, etiqueta):
++    parser = ConfigParser.ConfigParser()
++    parser.read(PATH_VMG_CONFIG)
++    val_old = get_GraphicsTools()  
++    if val_old == '1':
++        parser.set(encabezado, etiqueta, '0')
++        arch = open(PATH_VMG_CONFIG, 'w')
++        parser.write(arch)
++        arch.close()
++    else:
++        parser.set(encabezado, etiqueta, '1')
++        arch = open(PATH_VMG_CONFIG, 'w')
++        parser.write(arch)
++        arch.close()    
++
++def get_InvertColors():
++    return leer_config('General', 'InvertColors')
++
++def set_InvertColors():
++    grabar_config_InvertColors('General', 'InvertColors')
++
++def grabar_config_InvertColors(encabezado, etiqueta):
++    parser = ConfigParser.ConfigParser()
++    parser.read(PATH_VMG_CONFIG)
++    val_old = get_InvertColors()  
++    if val_old == '1':
++        parser.set(encabezado, etiqueta, '0')
++        arch = open(PATH_VMG_CONFIG, 'w')
++        parser.write(arch)
++        arch.close()
++    else:
++        parser.set(encabezado, etiqueta, '1')
++        arch = open(PATH_VMG_CONFIG, 'w')
++        parser.write(arch)
++        arch.close() 
++
++def leer_config(encabezado, etiqueta):
++    parser = ConfigParser.ConfigParser()
++    parser.read(PATH_VMG_CONFIG)
++    return parser.get(encabezado, etiqueta)
++
++def set_ruta_archivo():
++    try:
++        f = file(PATH_VMG_CONFIG)
++    except:
++        PATH_VMG_CONFIG = "/root/.magnifier.ini"
++
++def _run_cmd_async(cmd):
++    logger = logging.getLogger('magnifier')
++    logger.setLevel(logging.DEBUG)
++    try:
++        gobject.spawn_async([find_and_absolutize('launchVmg')])
++        logger.debug("Ejecuto magnifier")
++    except Exception, e:
++        logger.debug("Error ejecutando magnifier" + str(e))
++ 
++def find_and_absolutize(script_name):
++    paths = env.os.environ['PATH'].split(':')
++    for path in paths:
++        looking_path =  path + '/' + script_name
++        if env.os.path.isfile(looking_path):
++            return looking_path
++    return None
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0026-accessibility_0003_cp_accessibility_contrast.patch.patch b/rpms/sugar/0026-accessibility_0003_cp_accessibility_contrast.patch.patch
new file mode 100644
index 0000000..7659473
--- /dev/null
+++ b/rpms/sugar/0026-accessibility_0003_cp_accessibility_contrast.patch.patch
@@ -0,0 +1,429 @@
+From 5e5effd135a455a3d18c02dc8c24248497a7cf57 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:20:13 +0100
+Subject: [PATCH sugar 26/74] accessibility_0003_cp_accessibility_contrast.patch
+
+[fix shell syntax]
+Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
+---
+ bin/sugar.in                                |   13 +++-
+ data/Makefile.am                            |   14 +++-
+ data/gtkrc-contrast.em                      |   12 +++
+ extensions/cpsection/accessibility/model.py |   16 +++-
+ extensions/cpsection/accessibility/view.py  |  116 ++++++++++++++++++++++-----
+ src/jarabe/controlpanel/gui.py              |    3 +-
+ src/jarabe/desktop/activitieslist.py        |    3 +-
+ src/jarabe/desktop/favoritesview.py         |    5 +-
+ src/jarabe/model/accessibility.py           |   20 ++++-
+ 9 files changed, 167 insertions(+), 35 deletions(-)
+ create mode 100644 data/gtkrc-contrast.em
+
+diff --git a/bin/sugar.in b/bin/sugar.in
+index d6295bf..ed24561 100644
+--- a/bin/sugar.in
++++ b/bin/sugar.in
+@@ -45,7 +45,18 @@ if test -z "$SUGAR_SCALING"; then
+     export SUGAR_SCALING=100
+ fi
+ 
+-export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
++if gconftool-2 --dir-exists=/desktop/sugar/interface ; then
++    THEME="$(gconftool-2 --get /desktop/sugar/interface/gtk_theme)"
++    if [ "$THEME" = 'sugar-contrast' ]; then
++        GTK2_THEME="sugar-$SUGAR_SCALING-contrast"
++    else
++        GTK2_THEME="sugar-$SUGAR_SCALING"
++    fi
++else
++    GTK2_THEME="sugar-$SUGAR_SCALING"
++fi
++
++export GTK2_RC_FILES="@prefix@/share/sugar/data/$GTK2_THEME.gtkrc"
+ 
+ # Needed for executing wpa_passphrase
+ export PATH="$PATH":/sbin:/usr/sbin
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 6a62d23..2a92ce1 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -8,6 +8,14 @@ sugar-100.gtkrc: gtkrc.em
+ 	$(srcdir)/em.py -D scaling=\'100\' $(srcdir)/gtkrc.em > \
+ 		$(top_builddir)/data/sugar-100.gtkrc
+ 
++sugar-100-contrast.gtkrc: gtkrc-contrast.em
++	$(srcdir)/em.py -D scaling=\'100\' $(srcdir)/gtkrc-contrast.em > \
++		$(top_builddir)/data/sugar-100-contrast.gtkrc
++
++sugar-72-contrast.gtkrc: gtkrc-contrast.em
++	$(srcdir)/em.py -D scaling=\'100\' $(srcdir)/gtkrc-contrast.em > \
++		$(top_builddir)/data/sugar-72-contrast.gtkrc
++
+ sugardir = $(pkgdatadir)/data
+ sugar_DATA =			\
+ 	activities.defaults	\
+@@ -18,7 +26,9 @@ sugar_DATA =			\
+ 
+ GTKRC_FILES =		\
+ 	sugar-72.gtkrc	\
+-	sugar-100.gtkrc
++	sugar-100.gtkrc \
++	sugar-100-contrast.gtkrc \
++	sugar-72-contrast.gtkrc
+ 
+ xsessionsdir = $(datadir)/xsessions
+ xsessions_DATA = sugar.desktop
+@@ -64,5 +74,5 @@ endif
+ icondir = $(datadir)/icons/hicolor/scalable/apps
+ icon_DATA = sugar-xo.svg
+ 
+-EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files) $(icon_DATA)
++EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em gtkrc-contrast.em $(schema_in_files) $(icon_DATA)
+ CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(schema_DATA)
+diff --git a/data/gtkrc-contrast.em b/data/gtkrc-contrast.em
+new file mode 100644
+index 0000000..dceb103
+--- /dev/null
++++ b/data/gtkrc-contrast.em
+@@ -0,0 +1,12 @@
++@{
++if scaling == '72':
++    icon_sizes = 'gtk-large-toolbar=40,40'
++else:
++    icon_sizes = 'gtk-large-toolbar=55,55'
++}@
++gtk-theme-name = "sugar-@scaling-contrast"
++gtk-icon-theme-name = "sugar"
++gtk-cursor-theme-name = "sugar"
++gtk-toolbar-style = GTK_TOOLBAR_ICONS
++gtk-icon-sizes = "@icon_sizes"
++gtk-cursor-blink-timeout = 3
+diff --git a/extensions/cpsection/accessibility/model.py b/extensions/cpsection/accessibility/model.py
+index 5136460..8769d24 100644
+--- a/extensions/cpsection/accessibility/model.py
++++ b/extensions/cpsection/accessibility/model.py
+@@ -17,15 +17,12 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-import subprocess
+-import gconf
+-
+-from gettext import gettext as _
+ from jarabe.model import accessibility
+ 
+ keyboard = accessibility.Keyboard()
++screen = accessibility.Screen()
+ 
+-KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys']
++KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast']
+ 
+ def get_mouse_keys():
+     return keyboard.get_mouse_keys()
+@@ -53,3 +50,12 @@ def set_bounce_keys(activar):
+ 
+ def print_bounce_keys():
+     print str(get_bounce_keys())
++
++def get_contrast():
++    return screen.get_contrast()
++
++def set_contrast(activar):
++    screen.set_contrast(activar)
++
++def print_contrast():
++    print str(get_contrast())
+\ No newline at end of file
+diff --git a/extensions/cpsection/accessibility/view.py b/extensions/cpsection/accessibility/view.py
+index 9f291ac..bae14dc 100644
+--- a/extensions/cpsection/accessibility/view.py
++++ b/extensions/cpsection/accessibility/view.py
+@@ -23,7 +23,6 @@
+ 
+ from sugar.graphics import style
+ 
+-from jarabe import config
+ from jarabe.controlpanel.sectionview import SectionView
+ from jarabe.controlpanel.inlinealert import InlineAlert
+ 
+@@ -32,29 +31,73 @@ def __init__(self, model, alerts=None):
+         SectionView.__init__(self)
+ 
+         self._model = model
++        self.restart_alerts = alerts
+         self.set_border_width(style.DEFAULT_SPACING * 2)
+         self.set_spacing(style.DEFAULT_SPACING)
+-        group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
+-     
+-        separator_pm = gtk.HSeparator()
+-        self.pack_start(separator_pm, expand=False)
+-        separator_pm.show()
++        scrollwindow = gtk.ScrolledWindow()
++        scrollwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
++        self.pack_start(scrollwindow, expand=True)
++        scrollwindow.show()
+ 
+-        label_pm_teclado = gtk.Label(_('Keyboard'))
+-        label_pm_teclado.set_alignment(0, 0)
+-        self.pack_start(label_pm_teclado, expand=False)
+-        label_pm_teclado.show()
++        self._vbox_section = gtk.VBox()
++        scrollwindow.add_with_viewport(self._vbox_section)
++        self._vbox_section.show()
+ 
+-        self.box_pm = gtk.VBox()
+-        self.box_pm.set_border_width(style.DEFAULT_SPACING * 2)
+-        self.box_pm.set_spacing(style.DEFAULT_SPACING)       
++        self._zone_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
++        self.pack_start(self._zone_alert_box, False)
++
++        self._zone_alert = InlineAlert()
++        self._zone_alert_box.pack_start(self._zone_alert)
++        if 'zone' in self.restart_alerts:
++            self._zone_alert.props.msg = self.restart_msg
++            self._zone_alert.show()
++        self._zone_alert_box.show()
++
++        self.needs_restart = False
++
++        self._view_keyboard_options()
++        self._view_screen_options()
++
++
++    def _view_keyboard_options(self):
++        separator_pm_keyboard = gtk.HSeparator()
++        self._vbox_section.pack_start(separator_pm_keyboard, expand=False)
++        separator_pm_keyboard.show()
++
++        label_pm_keyboard = gtk.Label(_('Keyboard'))
++        label_pm_keyboard.set_alignment(0, 0)
++        self._vbox_section.pack_start(label_pm_keyboard, expand=False)
++        label_pm_keyboard.show()
++
++        self.box_pm_keyboard = gtk.VBox()
++        self.box_pm_keyboard.set_border_width(style.DEFAULT_SPACING * 2)
++        self.box_pm_keyboard.set_spacing(style.DEFAULT_SPACING)
+ 
+         self._view_mouse_keys()
+         self._view_sticky_keys()
+         self._view_bounce_keys()
+ 
+-        self.pack_start(self.box_pm, expand=False)
+-        self.box_pm.show()
++        self._vbox_section.pack_start(self.box_pm_keyboard, expand=False)
++        self.box_pm_keyboard.show()
++
++    def _view_screen_options(self):
++        separator_pm_screen = gtk.HSeparator()
++        self._vbox_section.pack_start(separator_pm_screen, expand=False)
++        separator_pm_screen.show()
++
++        label_pm_screen = gtk.Label(_('Screen'))
++        label_pm_screen.set_alignment(0, 0)
++        self._vbox_section.pack_start(label_pm_screen, expand=False)
++        label_pm_screen.show()
++
++        self.box_pm_screen = gtk.VBox()
++        self.box_pm_screen.set_border_width(style.DEFAULT_SPACING * 2)
++        self.box_pm_screen.set_spacing(style.DEFAULT_SPACING)
++
++        self._view_contrast()
++
++        self._vbox_section.pack_start(self.box_pm_screen, expand=False)
++        self.box_pm_screen.show()
+     
+     def _set_mouse_keys(self, widget):
+         state = widget.get_active()
+@@ -68,22 +111,35 @@ def _set_bounce_keys(self, widget):
+         state = widget.get_active()
+         self._model.set_bounce_keys(state)
+ 
++    def _set_contrast(self, widget):
++        state = widget.get_active()
++        self._model.set_contrast(state)
++        self.restart_alerts.append('zone')
++        self.needs_restart = True
++        self._zone_alert.props.msg = self.restart_msg
++        self._zone_alert.show()
++
+     def undo(self):
+         self._model.set_mouse_keys(self.init_state_mouse_keys)
+         self._model.set_sticky_keys(self.init_state_sticky_keys)
+         self._model.set_bounce_keys(self.init_state_bounce_keys)
+ 
++        self._model.set_contrast(self.init_state_contrast)
++        self.btn_contrast.set_active(self.init_state_contrast)
++        self.needs_restart = False
++        self._zone_alert.hide()
++
+     def _view_mouse_keys(self):
+         self.btn_mouse_keys = gtk.CheckButton(_('Mouse Keys'))
+         self._mouse_pm_change_handler = self.btn_mouse_keys.connect("toggled", self._set_mouse_keys)
+         self.init_state_mouse_keys = self._model.get_mouse_keys() 
+         self.btn_mouse_keys.set_active(self.init_state_mouse_keys)            
+-        self.box_pm.pack_start(self.btn_mouse_keys, True, True, 2)
++        self.box_pm_keyboard.pack_start(self.btn_mouse_keys, True, True, 2)
+         self.btn_mouse_keys.show()
+ 
+         lbl_mouse = gtk.Label(_('Move the mouse pointer with keyboard number.'))
+         lbl_mouse.set_alignment(0, 0)
+-        self.box_pm.pack_start(lbl_mouse, True, True, 2)
++        self.box_pm_keyboard.pack_start(lbl_mouse, True, True, 2)
+         lbl_mouse.show()
+ 
+     def _view_sticky_keys(self):
+@@ -91,13 +147,13 @@ def _view_sticky_keys(self):
+         self._sticky_pm_change_handler = self.btn_sticky_keys.connect("toggled", self._set_sticky_keys)
+         self.init_state_sticky_keys = self._model.get_sticky_keys()
+         self.btn_sticky_keys.set_active(self.init_state_sticky_keys)
+-        self.box_pm.pack_start(self.btn_sticky_keys, True, True, 2)
++        self.box_pm_keyboard.pack_start(self.btn_sticky_keys, True, True, 2)
+         self.btn_sticky_keys.show()
+ 
+         lbl_sticky = gtk.Label(_('Instead of having to press two keys at once (such as CTRL + Q), you can press one key at a time.'))
+         lbl_sticky.set_line_wrap(True)
+         lbl_sticky.set_alignment(0, 0)
+-        self.box_pm.pack_start(lbl_sticky, True, True, 2)
++        self.box_pm_keyboard.pack_start(lbl_sticky, True, True, 2)
+         lbl_sticky.show()
+ 
+     def _view_bounce_keys(self):
+@@ -105,10 +161,28 @@ def _view_bounce_keys(self):
+         self._bounce_pm_change_handler = self.btn_bounce_keys.connect("toggled", self._set_bounce_keys)
+         self.init_state_bounce_keys = self._model.get_bounce_keys()
+         self.btn_bounce_keys.set_active(self.init_state_bounce_keys)
+-        self.box_pm.pack_start(self.btn_bounce_keys, True, True, 2)
++        self.box_pm_keyboard.pack_start(self.btn_bounce_keys, True, True, 2)
+         self.btn_bounce_keys.show()
+ 
+         lbl_bounce = gtk.Label(_('Ignore rapid, repeated keypresses of the same key.'))
+         lbl_bounce.set_alignment(0, 0)
+-        self.box_pm.pack_start(lbl_bounce, True, True, 2)
++        self.box_pm_keyboard.pack_start(lbl_bounce, True, True, 2)
+         lbl_bounce.show()
++
++    def _view_contrast(self):
++        self.btn_contrast = gtk.CheckButton(_('Contrast'))
++        self._contrast_pm_change_handler = self.btn_contrast.connect("toggled", self._set_contrast)
++        self.init_state_contrast = self._model.get_contrast()
++        if self.init_state_contrast:
++            self.btn_contrast.handler_block(self._contrast_pm_change_handler)
++            self.btn_contrast.set_active(True)
++            self.btn_contrast.handler_unblock(self._contrast_pm_change_handler)
++        else:
++            self.btn_contrast.set_active(False)
++        self.box_pm_screen.pack_start(self.btn_contrast, True, True, 2)
++        self.btn_contrast.show()
++
++        lbl_contrast = gtk.Label(_('Enables the color contrast of the graphic interface.'))
++        lbl_contrast.set_alignment(0, 0)
++        self.box_pm_screen.pack_start(lbl_contrast, True, True, 2)
++        lbl_contrast.show()
+diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
+index 46810aa..61520e0 100644
+--- a/src/jarabe/controlpanel/gui.py
++++ b/src/jarabe/controlpanel/gui.py
+@@ -1,4 +1,5 @@
+ # Copyright (C) 2008 One Laptop Per Child
++# Copyright (C) 2010 Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -242,7 +243,7 @@ def show_section_view(self, option):
+         self._section_view.connect('request-close',
+                                    self.__close_request_cb)
+         self._main_view.modify_bg(gtk.STATE_NORMAL,
+-                                  style.COLOR_WHITE.get_gdk_color())
++                                  style.COLOR_BG_CP.get_gdk_color())
+ 
+     def set_section_view_auto_close(self):
+         """Automatically close the control panel if there is "nothing to do"
+diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
+index 44b0725..e34abd6 100644
+--- a/src/jarabe/desktop/activitieslist.py
++++ b/src/jarabe/desktop/activitieslist.py
+@@ -1,5 +1,6 @@
+ # Copyright (C) 2008 One Laptop Per Child
+ # Copyright (C) 2009 Tomeu Vizoso
++# Copyright (C) 2010 Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -269,7 +270,7 @@ def __init__(self, tree_view):
+         self.props.width = style.GRID_CELL_SIZE
+         self.props.height = style.GRID_CELL_SIZE
+         self.props.size = style.STANDARD_ICON_SIZE
+-        self.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg()
++        self.props.stroke_color = style.COLOR_DESKTOP_ICON.get_svg()
+         self.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
+         self.props.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE
+ 
+diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
+index 75795cd..c2ff370 100644
+--- a/src/jarabe/desktop/favoritesview.py
++++ b/src/jarabe/desktop/favoritesview.py
+@@ -1,5 +1,6 @@
+ # Copyright (C) 2006-2007 Red Hat, Inc.
+ # Copyright (C) 2008 One Laptop Per Child
++# Copyright (C) 2010 Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -427,7 +428,7 @@ def __get_last_activity_error_handler_cb(self, error):
+     def _update(self):
+         self.palette = None
+         if not self._resume_mode or not self._journal_entries:
+-            xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
++            xo_color = XoColor('%s,%s' % (style.COLOR_DESKTOP_ICON.get_svg(),
+                                           style.COLOR_TRANSPARENT.get_svg()))
+         else:
+             xo_color = misc.get_icon_color(self._journal_entries[0])
+@@ -536,7 +537,7 @@ def __init__(self, activity_info, journal_entries):
+         ActivityPalette.__init__(self, activity_info)
+ 
+         if not journal_entries:
+-            xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
++            xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
+                                           style.COLOR_TRANSPARENT.get_svg()))
+         else:
+             xo_color = misc.get_icon_color(journal_entries[0])
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index b851b3c..0324495 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -20,8 +20,6 @@
+ import subprocess
+ import gconf
+ 
+-from gettext import gettext as _
+-
+ class Keyboard:
+ 
+     def get_mouse_keys(self):
+@@ -67,6 +65,24 @@ def run_config_keyboard(self):
+             cmd += ['-mousekeys', 'mousemaxspeed', '3000', 'mousetimetomax', '1000', '+timeout', '+repeatkeys']
+         subprocess.call(cmd)
+ 
++class Screen:
++
++    CONTRAST_THEME="sugar-contrast"
++    DEFAULT_THEME="sugar"
++
++    def get_contrast(self):
++        client = gconf.client_get_default()
++        value = client.get_string("/desktop/sugar/interface/gtk_theme")
++        return value==self.CONTRAST_THEME
++
++    def set_contrast(self, activar):
++        client = gconf.client_get_default()
++        if (activar):
++            client.set_string("/desktop/sugar/interface/gtk_theme", self.CONTRAST_THEME)
++        else:
++            client.set_string("/desktop/sugar/interface/gtk_theme", self.DEFAULT_THEME)
++
++
+ class AccessibilityManager:
+     def setup_accessibility(self):
+         client = gconf.client_get_default()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0027-accessibility_0004_cp_accessibility_mouse.patch.patch b/rpms/sugar/0027-accessibility_0004_cp_accessibility_mouse.patch.patch
new file mode 100644
index 0000000..d8cabbf
--- /dev/null
+++ b/rpms/sugar/0027-accessibility_0004_cp_accessibility_mouse.patch.patch
@@ -0,0 +1,305 @@
+From 9e33a1bc941bdd0f4a9a15be83742d290c112142 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:22:25 +0100
+Subject: [PATCH sugar 27/74] accessibility_0004_cp_accessibility_mouse.patch
+
+[fixed shell script syntax]
+Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
+---
+ bin/sugar.in                                |   10 +++-
+ data/gtkrc-contrast.em                      |    1 -
+ data/gtkrc.em                               |    1 -
+ extensions/cpsection/accessibility/model.py |   23 +++++++-
+ extensions/cpsection/accessibility/view.py  |   80 +++++++++++++++++++++++++++
+ src/jarabe/model/accessibility.py           |   50 ++++++++++++++++-
+ 6 files changed, 159 insertions(+), 6 deletions(-)
+
+diff --git a/bin/sugar.in b/bin/sugar.in
+index ed24561..90fbf8f 100644
+--- a/bin/sugar.in
++++ b/bin/sugar.in
+@@ -87,7 +87,15 @@ if [ -f ~/.sugar/debug ]; then
+         . ~/.sugar/debug
+ fi
+ 
+-echo Xcursor.theme: sugar | xrdb -merge
++
++if gconftool-2 --dir-exists=/desktop/sugar/peripherals/mouse ; then
++    CURSOR_THEME="$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme)"
++else
++    CURSOR_THEME="sugar"
++fi
++
++
++echo Xcursor.theme: $CURSOR_THEME | xrdb -merge
+ metacity --no-force-fullscreen -d $DISPLAY &
+ 
+ exec sugar-session
+diff --git a/data/gtkrc-contrast.em b/data/gtkrc-contrast.em
+index dceb103..3ed4717 100644
+--- a/data/gtkrc-contrast.em
++++ b/data/gtkrc-contrast.em
+@@ -6,7 +6,6 @@ else:
+ }@
+ gtk-theme-name = "sugar-@scaling-contrast"
+ gtk-icon-theme-name = "sugar"
+-gtk-cursor-theme-name = "sugar"
+ gtk-toolbar-style = GTK_TOOLBAR_ICONS
+ gtk-icon-sizes = "@icon_sizes"
+ gtk-cursor-blink-timeout = 3
+diff --git a/data/gtkrc.em b/data/gtkrc.em
+index d4e1a7c..4459c42 100644
+--- a/data/gtkrc.em
++++ b/data/gtkrc.em
+@@ -6,7 +6,6 @@ else:
+ }@
+ gtk-theme-name = "sugar-@scaling"
+ gtk-icon-theme-name = "sugar"
+-gtk-cursor-theme-name = "sugar"
+ gtk-toolbar-style = GTK_TOOLBAR_ICONS
+ gtk-icon-sizes = "@icon_sizes"
+ gtk-cursor-blink-timeout = 3
+diff --git a/extensions/cpsection/accessibility/model.py b/extensions/cpsection/accessibility/model.py
+index 8769d24..6e5b154 100644
+--- a/extensions/cpsection/accessibility/model.py
++++ b/extensions/cpsection/accessibility/model.py
+@@ -21,8 +21,9 @@
+ 
+ keyboard = accessibility.Keyboard()
+ screen = accessibility.Screen()
++mouse = accessibility.Mouse()
+ 
+-KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast']
++KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast', 'white_mouse', 'accel_mouse']
+ 
+ def get_mouse_keys():
+     return keyboard.get_mouse_keys()
+@@ -58,4 +59,22 @@ def set_contrast(activar):
+     screen.set_contrast(activar)
+ 
+ def print_contrast():
+-    print str(get_contrast())
+\ No newline at end of file
++    print str(get_contrast())
++
++def get_white_mouse():
++    return mouse.get_white_mouse()
++
++def set_white_mouse(activar):
++    mouse.set_white_mouse(activar)
++
++def print_white_mouse():
++    print str(get_white_mouse())
++
++def get_accel_mouse():
++	return mouse.get_accel_mouse()
++
++def set_accel_mouse(valor):
++	mouse.set_accel_mouse(valor)
++
++def print_accel_mouse():
++    print str(get_accel_mouse())
+\ No newline at end of file
+diff --git a/extensions/cpsection/accessibility/view.py b/extensions/cpsection/accessibility/view.py
+index bae14dc..23de47e 100644
+--- a/extensions/cpsection/accessibility/view.py
++++ b/extensions/cpsection/accessibility/view.py
+@@ -57,6 +57,7 @@ def __init__(self, model, alerts=None):
+ 
+         self._view_keyboard_options()
+         self._view_screen_options()
++        self._view_mouse_options()
+ 
+ 
+     def _view_keyboard_options(self):
+@@ -98,6 +99,26 @@ def _view_screen_options(self):
+ 
+         self._vbox_section.pack_start(self.box_pm_screen, expand=False)
+         self.box_pm_screen.show()
++
++    def _view_mouse_options(self):
++        separator_pm_mouse = gtk.HSeparator()
++        self._vbox_section.pack_start(separator_pm_mouse, expand=False)
++        separator_pm_mouse.show()
++
++        label_pm_mouse = gtk.Label(_('Mouse'))
++        label_pm_mouse.set_alignment(0, 0)
++        self._vbox_section.pack_start(label_pm_mouse, expand=False)
++        label_pm_mouse.show()
++
++        self.box_pm_mouse = gtk.VBox()
++        self.box_pm_mouse.set_border_width(style.DEFAULT_SPACING * 2)
++        self.box_pm_mouse.set_spacing(style.DEFAULT_SPACING)
++
++        self._view_white_mouse()
++        self._view_acceleration_mouse()
++
++        self._vbox_section.pack_start(self.box_pm_mouse, expand=False)
++        self.box_pm_mouse.show()
+     
+     def _set_mouse_keys(self, widget):
+         state = widget.get_active()
+@@ -119,6 +140,17 @@ def _set_contrast(self, widget):
+         self._zone_alert.props.msg = self.restart_msg
+         self._zone_alert.show()
+ 
++    def _set_white_mouse(self, widget):
++        state = widget.get_active()
++        self._model.set_white_mouse(state)
++        self.restart_alerts.append('zone')
++        self.needs_restart = True
++        self._zone_alert.props.msg = self.restart_msg
++        self._zone_alert.show()
++
++    def cb_digits_scale_accel_mouse(self, adj):
++        self._model.set_accel_mouse(adj.value)
++
+     def undo(self):
+         self._model.set_mouse_keys(self.init_state_mouse_keys)
+         self._model.set_sticky_keys(self.init_state_sticky_keys)
+@@ -126,6 +158,12 @@ def undo(self):
+ 
+         self._model.set_contrast(self.init_state_contrast)
+         self.btn_contrast.set_active(self.init_state_contrast)
++
++        self._model.set_white_mouse(self.init_state_white_mouse)
++        self.btn_white_mouse.set_active(self.init_state_white_mouse)
++        
++        self.adj_accel_mouse.set_value(self.init_state_accel_mouse)
++
+         self.needs_restart = False
+         self._zone_alert.hide()
+ 
+@@ -186,3 +224,45 @@ def _view_contrast(self):
+         lbl_contrast.set_alignment(0, 0)
+         self.box_pm_screen.pack_start(lbl_contrast, True, True, 2)
+         lbl_contrast.show()
++
++    def _view_white_mouse(self):
++        self.btn_white_mouse = gtk.CheckButton(_('White Mouse'))
++        self._white_mouse_pm_change_handler = self.btn_white_mouse.connect("toggled", self._set_white_mouse)
++        self.init_state_white_mouse = self._model.get_white_mouse()
++        if self.init_state_white_mouse:
++    	    self.btn_white_mouse.handler_block(self._white_mouse_pm_change_handler)
++            self.btn_white_mouse.set_active(True)
++            self.btn_white_mouse.handler_unblock(self._white_mouse_pm_change_handler)
++        else:
++            self.btn_white_mouse.set_active(False)
++        self.box_pm_mouse.pack_start(self.btn_white_mouse, True, True, 2)
++        self.btn_white_mouse.show()
++
++        lbl_white_mouse = gtk.Label(_('Show the mouse cursor white.'))
++        lbl_white_mouse.set_alignment(0, 0)
++        self.box_pm_mouse.pack_start(lbl_white_mouse, True, True, 2)
++        lbl_white_mouse.show()
++
++    def _view_acceleration_mouse(self):
++        box_accel_mouse = gtk.HBox(False, 0)
++        box_accel_mouse.set_border_width(0)
++        lbl_accel_mouse = gtk.Label(_('Acceleration: '))
++        lbl_accel_mouse.show()
++        box_accel_mouse.pack_start(lbl_accel_mouse, False, False, 0)
++
++        self.init_state_accel_mouse = self._model.get_accel_mouse();
++        self.adj_accel_mouse = gtk.Adjustment(self.init_state_accel_mouse, 0.0, 5.0, 1.0, 1.0, 0.0)
++        self.adj_accel_mouse.connect("value_changed", self.cb_digits_scale_accel_mouse)
++        self.scale_accel_mouse = gtk.HScale(self.adj_accel_mouse)
++        self.scale_accel_mouse.set_digits(0)
++        self.scale_accel_mouse.show()
++
++        box_accel_mouse.pack_start(self.scale_accel_mouse, True, True, 0)
++        box_accel_mouse.show()
++
++        self.box_pm_mouse.pack_start(box_accel_mouse, True, True, 2)
++
++        desc_accel_mouse = gtk.Label(_('Controller acceleration mouse.'))
++        desc_accel_mouse.set_alignment(0, 0)
++        self.box_pm_mouse.pack_start(desc_accel_mouse, True, True, 2)
++        desc_accel_mouse.show()
+\ No newline at end of file
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index 0324495..c06f5c0 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -17,6 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++import gtk
+ import subprocess
+ import gconf
+ 
+@@ -67,8 +68,10 @@ def run_config_keyboard(self):
+ 
+ class Screen:
+ 
+-    CONTRAST_THEME="sugar-contrast"
+     DEFAULT_THEME="sugar"
++    DEFAULT_FONT_SIZE=7
++    CONTRAST_THEME="sugar-contrast"
++    CONTRAST_FONT_SIZE=9.5
+ 
+     def get_contrast(self):
+         client = gconf.client_get_default()
+@@ -79,9 +82,52 @@ def set_contrast(self, activar):
+         client = gconf.client_get_default()
+         if (activar):
+             client.set_string("/desktop/sugar/interface/gtk_theme", self.CONTRAST_THEME)
++            client.set_float('/desktop/sugar/font/default_size', self.CONTRAST_FONT_SIZE)
+         else:
+             client.set_string("/desktop/sugar/interface/gtk_theme", self.DEFAULT_THEME)
++            client.set_float('/desktop/sugar/font/default_size', self.DEFAULT_FONT_SIZE)
++
++class Mouse:
++
++    WHITE_CURSOR_THEME="FlatbedCursors.White.Huge"
++    DEFAULT_CURSOR_THEME="sugar"
++
++    def get_white_mouse(self):
++        client = gconf.client_get_default()
++        value = client.get_string("/desktop/sugar/peripherals/mouse/cursor_theme")
++        return value==self.WHITE_CURSOR_THEME
++
++    def set_white_mouse(self, activar):
++        client = gconf.client_get_default()
++        if (activar):
++            client.set_string("/desktop/sugar/peripherals/mouse/cursor_theme", self.WHITE_CURSOR_THEME)
++        else:
++            client.set_string("/desktop/sugar/peripherals/mouse/cursor_theme", self.DEFAULT_CURSOR_THEME)
++
++    def _set_white_mouse_setting(self):
++        cursor_theme = self.DEFAULT_CURSOR_THEME
++        if (self.get_white_mouse()):
++            cursor_theme = self.WHITE_CURSOR_THEME
++        settings = gtk.settings_get_default()
++        settings.set_property("gtk-cursor-theme-name", "%s" % (cursor_theme))
++
++    def get_accel_mouse(self):
++        client = gconf.client_get_default()
++        value = client.get_float("/desktop/sugar/peripherals/mouse/motion_acceleration")
++        return value
++
++    def set_accel_mouse(self, value):
++        client = gconf.client_get_default()
++        client.set_float("/desktop/sugar/peripherals/mouse/motion_acceleration", value)
++        self.run_config_mouse()
++
++    def _set_accel_mouse_setting(self):
++        cmd = ['xset', 'm' , str(self.get_accel_mouse())]
++        subprocess.call(cmd)
+ 
++    def run_config_mouse(self):
++        self._set_accel_mouse_setting()
++        self._set_white_mouse_setting()
+ 
+ class AccessibilityManager:
+     def setup_accessibility(self):
+@@ -90,3 +136,5 @@ def setup_accessibility(self):
+         if is_accessibility:
+             keyboard = Keyboard()
+             keyboard.run_config_keyboard()
++            mouse = Mouse()
++            mouse.run_config_mouse()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0028-accessibility_0005_cp_accessibility_capital_letters..patch b/rpms/sugar/0028-accessibility_0005_cp_accessibility_capital_letters..patch
new file mode 100644
index 0000000..395e27c
--- /dev/null
+++ b/rpms/sugar/0028-accessibility_0005_cp_accessibility_capital_letters..patch
@@ -0,0 +1,157 @@
+From 1de0246a0af984e6f9807059095dc4e492eadd27 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:22:54 +0100
+Subject: [PATCH sugar 28/74] accessibility_0005_cp_accessibility_capital_letters.patch
+
+---
+ extensions/cpsection/accessibility/model.py |   11 +++++++-
+ extensions/cpsection/accessibility/view.py  |   35 ++++++++++++++++++++++++++-
+ src/jarabe/model/accessibility.py           |   23 ++++++++++++++---
+ 3 files changed, 63 insertions(+), 6 deletions(-)
+
+diff --git a/extensions/cpsection/accessibility/model.py b/extensions/cpsection/accessibility/model.py
+index 6e5b154..9afec04 100644
+--- a/extensions/cpsection/accessibility/model.py
++++ b/extensions/cpsection/accessibility/model.py
+@@ -23,7 +23,7 @@
+ screen = accessibility.Screen()
+ mouse = accessibility.Mouse()
+ 
+-KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast', 'white_mouse', 'accel_mouse']
++KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast', 'white_mouse', 'accel_mouse', 'capital_letters']
+ 
+ def get_mouse_keys():
+     return keyboard.get_mouse_keys()
+@@ -61,6 +61,15 @@ def set_contrast(activar):
+ def print_contrast():
+     print str(get_contrast())
+ 
++def get_capital_letters():
++    return screen.get_capital_letters()
++
++def set_capital_letters(activar):
++    screen.set_capital_letters(activar)
++
++def print_capital_letters():
++    print str(get_capital_letters())
++
+ def get_white_mouse():
+     return mouse.get_white_mouse()
+ 
+diff --git a/extensions/cpsection/accessibility/view.py b/extensions/cpsection/accessibility/view.py
+index 23de47e..f06f7ae 100644
+--- a/extensions/cpsection/accessibility/view.py
++++ b/extensions/cpsection/accessibility/view.py
+@@ -96,6 +96,7 @@ def _view_screen_options(self):
+         self.box_pm_screen.set_spacing(style.DEFAULT_SPACING)
+ 
+         self._view_contrast()
++        self._view_letters()
+ 
+         self._vbox_section.pack_start(self.box_pm_screen, expand=False)
+         self.box_pm_screen.show()
+@@ -140,6 +141,14 @@ def _set_contrast(self, widget):
+         self._zone_alert.props.msg = self.restart_msg
+         self._zone_alert.show()
+ 
++    def _set_capital_letters(self, widget):
++        state = widget.get_active()
++        self._model.set_capital_letters(state)
++        self.restart_alerts.append('zone')
++        self.needs_restart = True
++        self._zone_alert.props.msg = self.restart_msg
++        self._zone_alert.show()
++
+     def _set_white_mouse(self, widget):
+         state = widget.get_active()
+         self._model.set_white_mouse(state)
+@@ -159,6 +168,9 @@ def undo(self):
+         self._model.set_contrast(self.init_state_contrast)
+         self.btn_contrast.set_active(self.init_state_contrast)
+ 
++        self._model.set_capital_letters(self.init_state_capital_letters)
++        self.btn_capital_letters.set_active(self.init_state_capital_letters)
++
+         self._model.set_white_mouse(self.init_state_white_mouse)
+         self.btn_white_mouse.set_active(self.init_state_white_mouse)
+         
+@@ -225,6 +237,24 @@ def _view_contrast(self):
+         self.box_pm_screen.pack_start(lbl_contrast, True, True, 2)
+         lbl_contrast.show()
+ 
++    def _view_letters(self):
++        self.btn_capital_letters = gtk.CheckButton(_('Capital letters'))
++        self._capital_letters_pm_change_handler = self.btn_capital_letters.connect("toggled", self._set_capital_letters)
++        self.init_state_capital_letters = self._model.get_capital_letters()
++        if self.init_state_capital_letters:
++    	    self.btn_capital_letters.handler_block(self._capital_letters_pm_change_handler)
++            self.btn_capital_letters.set_active(True)
++            self.btn_capital_letters.handler_unblock(self._capital_letters_pm_change_handler)
++        else:
++            self.btn_capital_letters.set_active(False)
++        self.box_pm_screen.pack_start(self.btn_capital_letters, True, True, 2)
++        self.btn_capital_letters.show()
++
++        lbl_capital_letters = gtk.Label(_('Shows capital letters in the user interface.'))
++        lbl_capital_letters.set_alignment(0, 0)
++        self.box_pm_screen.pack_start(lbl_capital_letters, True, True, 2)
++        lbl_capital_letters.show()
++
+     def _view_white_mouse(self):
+         self.btn_white_mouse = gtk.CheckButton(_('White Mouse'))
+         self._white_mouse_pm_change_handler = self.btn_white_mouse.connect("toggled", self._set_white_mouse)
+@@ -265,4 +295,7 @@ def _view_acceleration_mouse(self):
+         desc_accel_mouse = gtk.Label(_('Controller acceleration mouse.'))
+         desc_accel_mouse.set_alignment(0, 0)
+         self.box_pm_mouse.pack_start(desc_accel_mouse, True, True, 2)
+-        desc_accel_mouse.show()
+\ No newline at end of file
++        desc_accel_mouse.show()
++
++    def setup(self):
++        pass
+\ No newline at end of file
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index c06f5c0..299f8d4 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -68,10 +68,12 @@ def run_config_keyboard(self):
+ 
+ class Screen:
+ 
+-    DEFAULT_THEME="sugar"
+-    DEFAULT_FONT_SIZE=7
+-    CONTRAST_THEME="sugar-contrast"
+-    CONTRAST_FONT_SIZE=9.5
++    DEFAULT_THEME = "sugar"
++    DEFAULT_FONT_SIZE = 7
++    DEFAULT_FONT_FACE = "Sans Serif"
++    CONTRAST_THEME = "sugar-contrast"
++    CONTRAST_FONT_SIZE = 9.5
++    CAPITAL_LETTERS_FONT_FACE = "Oracle"
+ 
+     def get_contrast(self):
+         client = gconf.client_get_default()
+@@ -87,6 +89,19 @@ def set_contrast(self, activar):
+             client.set_string("/desktop/sugar/interface/gtk_theme", self.DEFAULT_THEME)
+             client.set_float('/desktop/sugar/font/default_size', self.DEFAULT_FONT_SIZE)
+ 
++    def get_capital_letters(self):
++        client = gconf.client_get_default()
++        value = client.get_string("/desktop/sugar/font/default_face")
++        return value==self.CAPITAL_LETTERS_FONT_FACE
++
++    def set_capital_letters(self, activar):
++        client = gconf.client_get_default()
++        if (activar):
++            client.set_string('/desktop/sugar/font/default_face', self.CAPITAL_LETTERS_FONT_FACE)
++        else:
++            client.set_string('/desktop/sugar/font/default_face', self.DEFAULT_FONT_FACE)
++
++
+ class Mouse:
+ 
+     WHITE_CURSOR_THEME="FlatbedCursors.White.Huge"
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0029-accessibility_0006_virtualkeyboard.patch.patch b/rpms/sugar/0029-accessibility_0006_virtualkeyboard.patch.patch
new file mode 100644
index 0000000..faa7fb0
--- /dev/null
+++ b/rpms/sugar/0029-accessibility_0006_virtualkeyboard.patch.patch
@@ -0,0 +1,2251 @@
+From d99a48e5d8690826d90594d5956a42e3fcb16802 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:24:08 +0100
+Subject: [PATCH sugar 29/74] accessibility_0006_virtualkeyboard.patch
+
+---
+ bin/sugar.in                             |    2 +
+ extensions/deviceicon/Makefile.am        |    1 +
+ extensions/deviceicon/virtualkeyboard.py |   72 ++
+ extensions/globalkey/Makefile.am         |    3 +-
+ extensions/globalkey/virtualkeyboard.py  |    9 +
+ src/jarabe/model/Makefile.am             |    3 +-
+ src/jarabe/model/virtualkeyboard.py      |  185 +++
+ src/jarabe/view/Makefile.am              |    3 +-
+ src/jarabe/view/virtualkeyboard.py       | 1883 ++++++++++++++++++++++++++++++
+ 9 files changed, 2158 insertions(+), 3 deletions(-)
+ create mode 100644 extensions/deviceicon/virtualkeyboard.py
+ create mode 100644 extensions/globalkey/virtualkeyboard.py
+ create mode 100644 src/jarabe/model/virtualkeyboard.py
+ create mode 100644 src/jarabe/view/virtualkeyboard.py
+
+diff --git a/bin/sugar.in b/bin/sugar.in
+index 90fbf8f..de3cfbd 100644
+--- a/bin/sugar.in
++++ b/bin/sugar.in
+@@ -98,4 +98,6 @@ fi
+ echo Xcursor.theme: $CURSOR_THEME | xrdb -merge
+ metacity --no-force-fullscreen -d $DISPLAY &
+ 
++[ -x /usr/bin/pulseaudio ] && /usr/bin/pulseaudio &
++
+ exec sugar-session
+diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.am
+index 0d15c38..3a74053 100644
+--- a/extensions/deviceicon/Makefile.am
++++ b/extensions/deviceicon/Makefile.am
+@@ -7,4 +7,5 @@ sugar_PYTHON = 		\
+ 	resources.py	\
+ 	speaker.py	\
+ 	touchpad.py	\
++	virtualkeyboard.py	\
+ 	volume.py
+diff --git a/extensions/deviceicon/virtualkeyboard.py b/extensions/deviceicon/virtualkeyboard.py
+new file mode 100644
+index 0000000..955f79b
+--- /dev/null
++++ b/extensions/deviceicon/virtualkeyboard.py
+@@ -0,0 +1,72 @@
++from gettext import gettext as _
++
++import logging
++import gobject
++import gtk
++import gconf
++import os
++
++from sugar.graphics.tray import TrayIcon
++from sugar.graphics.xocolor import XoColor
++from sugar.graphics.palette import Palette
++from sugar.graphics import style
++from jarabe.frame.frameinvoker import FrameWidgetInvoker
++
++import jarabe.view.virtualkeyboard
++
++class DeviceView(TrayIcon):
++
++    FRAME_POSITION_RELATIVE = 500
++
++    def __init__(self):
++        icon_name = 'virtualkeyboard'
++
++        client = gconf.client_get_default()
++        color = XoColor(client.get_string('/desktop/sugar/user/color'))
++        TrayIcon.__init__(self, icon_name=icon_name, xo_color=color)
++        self.set_palette_invoker(FrameWidgetInvoker(self))
++
++    def create_palette(self):
++        palette = VirtualkeyboardPalette(_('Teclado Virtual'))
++        palette.set_group_id('frame')
++        return palette
++
++class VirtualkeyboardPalette(Palette):
++
++    def __init__(self, primary_text):
++        Palette.__init__(self, label=primary_text)
++
++        self.connect('popup', self._popup_cb)
++        self.connect('popdown', self._popdown_cb)
++
++        self._popped_up = False
++
++        self._open_item = gtk.MenuItem(_('Open'))
++        self._open_item.connect('activate', self._open_activate_cb)
++        self.menu.append(self._open_item)
++        self._open_item.show()
++
++        self._close_item = gtk.MenuItem(_('Close'))
++        self._close_item.connect('activate', self._close_activate_cb)
++        self.menu.append(self._close_item)
++        self._close_item.show()
++
++    def _popup_cb(self, gobject_ref):
++        self._popped_up = True
++
++    def _popdown_cb(self, gobject_ref):
++        self._popped_up = False
++
++    def _open_activate_cb(self, gobject_ref):
++        self.v = jarabe.view.virtualkeyboard.Teclado()
++
++    def _close_activate_cb(self, gobject_ref):
++        try:
++            self.v.close()
++        except:
++            pass
++
++
++def setup(tray):
++    tray.add_device(DeviceView())
++
+diff --git a/extensions/globalkey/Makefile.am b/extensions/globalkey/Makefile.am
+index 49a8dd7..b44626e 100644
+--- a/extensions/globalkey/Makefile.am
++++ b/extensions/globalkey/Makefile.am
+@@ -4,4 +4,5 @@ sugar_PYTHON = 		\
+ 	__init__.py	\
+ 	magnifier.py	\
+ 	screenshot.py	\
+-	viewsource.py
++	viewsource.py	\
++	virtualkeyboard.py
+diff --git a/extensions/globalkey/virtualkeyboard.py b/extensions/globalkey/virtualkeyboard.py
+new file mode 100644
+index 0000000..bba0877
+--- /dev/null
++++ b/extensions/globalkey/virtualkeyboard.py
+@@ -0,0 +1,9 @@
++import logging
++
++import jarabe.view.virtualkeyboard
++
++BOUND_KEYS = ['<alt>k']
++
++def handle_key_press(key):
++    logging.debug('load virtual keyboard')
++    jarabe.view.virtualkeyboard.Teclado()
+diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
+index ee8b865..040b099 100644
+--- a/src/jarabe/model/Makefile.am
++++ b/src/jarabe/model/Makefile.am
+@@ -18,4 +18,5 @@ sugar_PYTHON =			\
+ 	screen.py		\
+         session.py		\
+ 	sound.py		\
+-	telepathyclient.py
++	telepathyclient.py	\
++	virtualkeyboard.py
+diff --git a/src/jarabe/model/virtualkeyboard.py b/src/jarabe/model/virtualkeyboard.py
+new file mode 100644
+index 0000000..b3e3659
+--- /dev/null
++++ b/src/jarabe/model/virtualkeyboard.py
+@@ -0,0 +1,185 @@
++#!/usr/bin/env python
++# -*- coding: UTF-8 -*-
++# VirtualKeyboard
++# Copyright (C) 2010 Plan Ceibal
++# pykey - http://shallowsky.com/software/crikey
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import subprocess
++import sys, os
++import time
++import Xlib.display
++import Xlib.X
++import Xlib.XK
++import Xlib.protocol.event
++
++class Teclado:
++    special_X_keysyms = {
++        ' ' : "space",
++        '\t' : "Tab",
++        '\n' : "Return",
++        '\r' : "BackSpace",
++        '\e' : "Escape",
++        '!' : "exclam",
++        '#' : "numbersign",
++        '%' : "percent",
++        '$' : "dollar",
++        '&' : "ampersand",
++        '"' : "quotedbl",
++        '\'' : "apostrophe",
++        '(' : "parenleft",
++        ')' : "parenright",
++        '*' : "asterisk",
++        '=' : "equal",
++        '+' : "plus",
++        ',' : "comma",
++        '-' : "minus",
++        '.' : "period",
++        '/' : "slash",
++        ':' : "colon",
++        ';' : "semicolon",
++        '<' : "less",
++        '>' : "greater",
++        '?' : "question",
++        '@' : "at",
++        '[' : "bracketleft",
++        ']' : "bracketright",
++        '\\' : "backslash",
++        '^' : "asciicircum",
++        '_' : "underscore",
++        '`' : "grave",
++        '{' : "braceleft",
++        '|' : "bar",
++        '}' : "braceright",
++        '~' : "asciitilde",
++        'ñ' : "ntilde",
++        'Ñ' : "Ntilde"
++    };
++
++    def __init__(self):
++        self.display = Xlib.display.Display()
++        self.window = self.display.get_input_focus()._data["focus"];
++
++    def get_keysym(self, ch) :
++        keysym = Xlib.XK.string_to_keysym(ch)
++        if keysym == 0:
++            keysym = Xlib.XK.string_to_keysym(self.special_X_keysyms[ch])
++        return keysym
++
++    def is_shifted(self, ch) :
++        if ch.isupper() :
++            return True
++        if "/=~!@#$%^&()_*{}|:;\">?Ñ".find(ch) >= 0 :
++            return True
++        return False
++
++    def char_to_keycode(self, ch) :
++        keysym = self.get_keysym(ch)
++        keycode = self.display.keysym_to_keycode(keysym)
++        if keycode == 0 :
++            print "Sorry, can't map", ch
++
++        if (self.is_shifted(ch)) :
++            shift_mask = Xlib.X.ShiftMask
++        else :
++            shift_mask = 0
++
++        return keycode, shift_mask
++
++
++    def send_string(self, ch):
++        keycode, shift_mask = self.char_to_keycode(ch)
++        self.escribir(keycode, shift_mask)
++
++    def escribir(self, keycode, shift_mask):
++        event = Xlib.protocol.event.KeyPress(
++            time = int(time.time()),
++            root = self.display.screen().root,
++            window = self.window,
++            same_screen = 0, child = Xlib.X.NONE,
++            root_x = 0, root_y = 0, event_x = 0, event_y = 0,
++            state = shift_mask,
++            detail = keycode
++            )
++        self.window.send_event(event, propagate = True)
++        event = Xlib.protocol.event.KeyRelease(
++            time = int(time.time()),
++            root = self.display.screen().root,
++            window = self.window,
++            same_screen = 0, child = Xlib.X.NONE,
++            root_x = 0, root_y = 0, event_x = 0, event_y = 0,
++            state = shift_mask,
++            detail = keycode
++            )
++        self.window.send_event(event, propagate = True)
++
++
++    def escribir_txt(self, txt):
++        self.display = Xlib.display.Display()
++        self.window = self.display.get_input_focus()._data["focus"];
++
++        if (txt == "ü"):
++            self.escribir(34, 1)
++            self.send_string("u")
++        elif (txt == "Ü"):
++            self.escribir(34, 1)
++            self.send_string("U")
++        elif (txt == "|"):
++            self.escribir(10, Xlib.X.Mod5Mask)
++        elif (txt == "@"):
++            self.escribir(11, Xlib.X.Mod5Mask)
++        elif (txt == "#"):
++            self.escribir(12, Xlib.X.Mod5Mask)
++        elif (txt == "º"):
++            self.escribir(49, 0)
++        elif (txt == "ª"):
++            self.escribir(49, 1)
++        elif (txt == "'"):
++            self.escribir(20, 0)
++        elif (txt == "¿"):
++            self.escribir(21, 1)
++        elif (txt == "¡"):
++            self.escribir(21, 0)
++        elif (txt == "'"):
++            self.escribir(34, 0)
++        elif (self.tieneTilde(txt)):
++            self.escribir(34, 0)
++            self.escribirVocal(txt)
++        else:
++            self.send_string(txt)
++
++        self.display.sync()
++
++    def tieneTilde(self, txt):
++        return "ÁÉÍÓÚáéíóú".find(txt) >= 0
++
++    def escribirVocal(self, txt):
++        if txt=="Á": self.send_string("A")
++        if txt=="É": self.send_string("E")
++        if txt=="Í": self.send_string("I")
++        if txt=="Ó": self.send_string("O")
++        if txt=="Ú": self.send_string("U")
++        if txt=="á": self.send_string("a")
++        if txt=="é": self.send_string("e")
++        if txt=="í": self.send_string("i")
++        if txt=="ó": self.send_string("o")
++        if txt=="ú": self.send_string("u")
++
++    def hablar(self, texto, s):
++        subprocess.call(["espeak", "-p", "30", "-s", s, "-v", "spanish", texto], stdout=subprocess.PIPE)
+diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am
+index 630f184..0b7d886 100644
+--- a/src/jarabe/view/Makefile.am
++++ b/src/jarabe/view/Makefile.am
+@@ -10,4 +10,5 @@ sugar_PYTHON =				\
+ 	pulsingicon.py			\
+ 	service.py			\
+ 	tabbinghandler.py		\
+-	viewsource.py
++	viewsource.py			\
++	virtualkeyboard.py
+diff --git a/src/jarabe/view/virtualkeyboard.py b/src/jarabe/view/virtualkeyboard.py
+new file mode 100644
+index 0000000..b873ae4
+--- /dev/null
++++ b/src/jarabe/view/virtualkeyboard.py
+@@ -0,0 +1,1883 @@
++#!/usr/bin/env python
++# -*- coding: UTF-8 -*-
++# Virtualkeyboard
++# Copyright (C) 2010 Plan Ceibal
++#
++# Author: Esteban Arias <earias@plan.ceibal.edu.uy>
++# Contact information: comunidad@plan.ceibal.edu.uy
++# Plan Ceibal http://www.ceibal.edu.uy
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import pygtk
++pygtk.require('2.0')
++import gtk
++import sys, os
++import time
++import pango
++import gconf
++import logging
++import threading
++import gobject
++
++import jarabe.model.virtualkeyboard
++from sugar.graphics.icon import Icon, get_icon_file_name
++
++gobject.threads_init()
++
++velocidades = {'lenta': 4500, 'media': 3000, 'rapida':1500}
++hablar = {'lenta': "170", 'media': "180", 'rapida':"275"}
++
++class Teclado:
++
++    def __init__(self):
++        self.BOTONESxBARRIDO = False;
++        self.BOTONESxBARRIDOxFILA = False;
++        self.MAYUSCULA = True;
++        self.fila_1 = [];
++        self.fila_2 = [];
++        self.fila_3 = [];
++        self.fila_4 = [];
++        self.fila_5 = [];
++        self.losBotones = [];
++        self.fila_actual = None;
++        self.btn_actual = None;
++        self.fila_actual_nro = -1;
++
++        self.seg = velocidades['media'];
++        self.hablar_al = "NUNCA";
++        self.size = "CHICO"
++        self.teclado_tipo = "COMPLETO";
++        self.inicilizar_config()
++
++#        self.desplegar()
++        if os.environ.has_key('virtualkeyboard'):
++            self.visible = os.environ['virtualkeyboard']
++            if self.visible == 'True':
++                return
++            else:
++                if self.visible == 'False':
++                    self.desplegar()
++        else:
++            self.desplegar()
++
++
++    def delete_event(self, widget, event=None):
++        self.close()
++
++    def close(self):
++        self.BOTONESxBARRIDOxFILA = False
++        self.BOTONESxBARRIDO = False
++        os.environ['virtualkeyboard'] = 'False'
++        logging.debug('close virtual keyboard')
++        self.dialog.destroy()
++        try:
++            self.hilo_type._Thread__stop()
++            self.hilo_size._Thread__stop()
++            self.hilo_bloquear._Thread__stop()
++            self.hilo_hablar._Thread__stop()
++        except:
++            pass
++        return False
++
++
++    def desplegar(self):
++        self._mTeclado=jarabe.model.virtualkeyboard.Teclado()
++
++        self.dialog = gtk.Dialog()
++        self.dialog.set_title("TECLADO VIRTUAL")
++        self.dialog.set_keep_above(True)
++        self.dialog.grab_focus()
++        try:
++            self.dialog.set_icon_from_file(get_icon_file_name('virtualkeyboard'))
++        except:
++            logging.debug('dont show virtual keyboard icon')
++
++        self.dialog.set_accept_focus(False)
++        self.dialog.connect("delete_event", self.delete_event)
++
++        #tipo de teclado:
++        try:
++            self.teclado_tipo = self.get_tipo_teclado()
++        except:
++            logging.error("init - error al leer teclado_tipo")
++            self.teclado_tipo  = "COMPLETO"
++
++        self.vbox_teclado = self.mostrar_teclado()
++
++        #sizes:
++        try:
++            self.size = self.get_size_botones()
++        except:
++            logging.error("init - error al leer size_botones")
++            self.size = "CHICO"
++
++        x, y = self.get_size_dialog(self.size, self.teclado_tipo)
++        font_desc = self.get_font_desc(self.size, self.teclado_tipo)
++        self.dialog.set_size_request(x, y)
++        self.sizeBotones(font_desc)
++
++        self.event_box = gtk.EventBox()
++        self.event_box.add(self.vbox_teclado)
++        self.event_box.set_events(gtk.gdk.BUTTON_PRESS)
++        self.event_box.show()
++        self.ebc = self.event_box.connect("button_press_event", self.mouse_boton)
++        self.dialog.vbox.pack_start(self.event_box, False, False, 5)
++
++        self.vbox_teclado.show_all()
++
++        self.posicionar_dialog(self.dialog)
++
++        self.dialog.show()
++
++        try:
++            self.hablar_al = self.get_opciones_hablar()
++        except:
++            logging.debug('init - Error  al cargar opciones.')
++            self.hablar_al = "NUNCA"
++
++        barriendo=""
++        try:
++            barriendo = self.leer_barrido()
++        except:
++            logging.error("init - Error al leer barrido.")
++            barriendo = "NO"
++
++        if barriendo == "SI":
++            try:
++                seg =self.get_time_barrido_botones()
++            except:
++                logging.error("init - error al leer time_barrido_botones")
++                seg = velocidades['media']
++
++            self.seg = seg
++            self.BOTONESxBARRIDOxFILA = True
++            self.botonesXbarridoXfila()
++
++        os.environ['virtualkeyboard'] = 'True'
++
++
++    def mostrar_teclado(self):
++        if (self.teclado_tipo == "COMPLETO"):
++            return self.mostrar_teclado_completo()
++        elif (self.teclado_tipo == "NUMERICO"):
++            return self.mostrar_teclado_numerico()
++        elif (self.teclado_tipo == "LETRAS"):
++            return self.mostrar_teclado_letras()
++
++    def mostrar_teclado_completo(self):
++        child = gtk.VBox(False, 2)
++
++        # defino botones
++        self.btn_BACK_SPACE = self.new_button_borrar()
++        self.losBotones.append(self.btn_BACK_SPACE)
++
++        self.btn_SPACE = self.new_button_espacio()
++        self.losBotones.append(self.btn_SPACE)
++
++        self.btn_CAPS_LOCK = self.new_button_mayuscula()
++        self.fila_3.append(self.btn_CAPS_LOCK)
++        self.losBotones.append(self.btn_CAPS_LOCK)
++
++        self.btn_ENTER = self.new_button_enter()	
++        self.losBotones.append(self.btn_ENTER)
++        self.fila_2.append(self.btn_ENTER)
++
++        self.btn_TAB = self.new_button_tab()
++        self.losBotones.append(self.btn_TAB)
++        self.fila_2.append(self.btn_TAB)
++
++        self.btn_do = self.new_button_escribir("º")
++        self.btn_do.set_text_desc("o superíndice")
++        self.losBotones.append(self.btn_do)
++        self.fila_1.append(self.btn_do)
++
++        self.btn_1 = self.new_button_escribir("1")
++        self.losBotones.append(self.btn_1)
++        self.fila_1.append(self.btn_1)
++
++        self.btn_2 = self.new_button_escribir("2")
++        self.losBotones.append(self.btn_2)
++        self.fila_1.append(self.btn_2)
++
++        self.btn_3 = self.new_button_escribir("3")
++        self.losBotones.append(self.btn_3)
++        self.fila_1.append(self.btn_3)
++
++        self.btn_4 = self.new_button_escribir("4")
++        self.losBotones.append(self.btn_4)
++        self.fila_1.append(self.btn_4)
++
++        self.btn_5 = self.new_button_escribir("5")
++        self.losBotones.append(self.btn_5)
++        self.fila_1.append(self.btn_5)
++
++        self.btn_6 = self.new_button_escribir("6")
++        self.losBotones.append(self.btn_6)
++        self.fila_1.append(self.btn_6)
++
++        self.btn_7 = self.new_button_escribir("7")
++        self.losBotones.append(self.btn_7)
++        self.fila_1.append(self.btn_7)
++
++        self.btn_8 = self.new_button_escribir("8")
++        self.losBotones.append(self.btn_8)
++        self.fila_1.append(self.btn_8)
++
++        self.btn_9 = self.new_button_escribir("9")
++        self.losBotones.append(self.btn_9)
++        self.fila_1.append(self.btn_9)
++
++        self.btn_0 = self.new_button_escribir("0")
++        self.losBotones.append(self.btn_0)
++        self.fila_1.append(self.btn_0)
++
++        self.btn_finPreg = self.new_button_escribir("'")
++        self.btn_finPreg.set_text_desc("comilla simple")
++        self.losBotones.append(self.btn_finPreg)
++        self.fila_1.append(self.btn_finPreg)
++
++        self.btn_inicioPreg = self.new_button_escribir("¡")
++        self.btn_inicioPreg.set_text_desc("abro exclamación")
++        self.losBotones.append(self.btn_inicioPreg)
++        self.fila_1.append(self.btn_inicioPreg)
++
++        self.btn_Q = self.new_button_escribir("Q")
++        self.losBotones.append(self.btn_Q)
++        self.fila_2.append(self.btn_Q)
++
++        self.btn_W = self.new_button_escribir("W")
++        self.losBotones.append(self.btn_W)
++        self.fila_2.append(self.btn_W)
++
++        self.btn_E = self.new_button_escribir("E")
++        self.losBotones.append(self.btn_E)
++        self.fila_2.append(self.btn_E)
++
++        self.btn_R = self.new_button_escribir("R")
++        self.losBotones.append(self.btn_R)
++        self.fila_2.append(self.btn_R)
++
++        self.btn_T = self.new_button_escribir("T")
++        self.losBotones.append(self.btn_T)
++        self.fila_2.append(self.btn_T)
++
++        self.btn_Y = self.new_button_escribir("Y")
++        self.losBotones.append(self.btn_Y)
++        self.fila_2.append(self.btn_Y)
++
++        self.btn_U = self.new_button_escribir("U")
++        self.losBotones.append(self.btn_U)
++        self.fila_2.append(self.btn_U)
++
++        self.btn_I = self.new_button_escribir("I")
++        self.losBotones.append(self.btn_I)
++        self.fila_2.append(self.btn_I)
++
++        self.btn_O = self.new_button_escribir("O")
++        self.losBotones.append(self.btn_O)
++        self.fila_2.append(self.btn_O)
++
++        self.btn_P = self.new_button_escribir("P")
++        self.losBotones.append(self.btn_P)
++        self.fila_2.append(self.btn_P)
++
++        self.btn_asterisco = self.new_button_escribir("*")
++        self.losBotones.append(self.btn_asterisco)
++        self.fila_2.append(self.btn_asterisco)
++
++        self.btn_cierra_llave = self.new_button_escribir("]")
++        self.btn_cierra_llave.set_text_desc("cierro paréntesis recto")
++        self.losBotones.append(self.btn_cierra_llave)
++
++        self.btn_A = self.new_button_escribir("A")
++        self.losBotones.append(self.btn_A)
++        self.fila_3.append(self.btn_A)
++
++        self.btn_S = self.new_button_escribir("S")
++        self.losBotones.append(self.btn_S)
++        self.fila_3.append(self.btn_S)
++
++        self.btn_D = self.new_button_escribir("D")
++        self.losBotones.append(self.btn_D)
++        self.fila_3.append(self.btn_D)
++
++        self.btn_F = self.new_button_escribir("F")
++        self.losBotones.append(self.btn_F)
++        self.fila_3.append(self.btn_F)
++
++        self.btn_G = self.new_button_escribir("G")
++        self.losBotones.append(self.btn_G)
++        self.fila_3.append(self.btn_G)
++
++        self.btn_H = self.new_button_escribir("H")
++        self.losBotones.append(self.btn_H)
++        self.fila_3.append(self.btn_H)
++
++        self.btn_J = self.new_button_escribir("J")
++        self.losBotones.append(self.btn_J)
++        self.fila_3.append(self.btn_J)
++
++        self.btn_K = self.new_button_escribir("K")
++        self.losBotones.append(self.btn_K)
++        self.fila_3.append(self.btn_K)
++
++        self.btn_L = self.new_button_escribir("L")
++        self.losBotones.append(self.btn_L)
++        self.fila_3.append(self.btn_L)
++
++        self.btn_enie = self.new_button_escribir("Ñ")
++        self.losBotones.append(self.btn_enie)
++        self.fila_3.append(self.btn_enie)
++
++        self.btn_mas = self.new_button_escribir("+")
++        self.btn_mas.set_text_desc("más")
++        self.losBotones.append(self.btn_mas)
++        self.fila_3.append(self.btn_mas)
++
++        self.fila_3.append(self.btn_cierra_llave)
++
++        self.btn_abre_llave = self.new_button_escribir("[")
++        self.btn_abre_llave.set_text_desc("abro paréntesis recto")
++        self.losBotones.append(self.btn_abre_llave)
++        self.fila_2.append(self.btn_abre_llave)
++
++        self.btn_Z = self.new_button_escribir("Z")
++        self.losBotones.append(self.btn_Z)
++        self.fila_4.append(self.btn_Z)
++
++        self.btn_X = self.new_button_escribir("X")
++        self.losBotones.append(self.btn_X)
++        self.fila_4.append(self.btn_X)
++
++        self.btn_C = self.new_button_escribir("C")
++        self.losBotones.append(self.btn_C)
++        self.fila_4.append(self.btn_C)
++
++        self.btn_V = self.new_button_escribir("V")
++        self.losBotones.append(self.btn_V)
++        self.fila_4.append(self.btn_V)
++
++        self.btn_B = self.new_button_escribir("B")
++        self.losBotones.append(self.btn_B)
++        self.fila_4.append(self.btn_B)
++
++        self.btn_N = self.new_button_escribir("N")
++        self.losBotones.append(self.btn_N)
++        self.fila_4.append(self.btn_N)
++
++        self.btn_M = self.new_button_escribir("M")
++        self.losBotones.append(self.btn_M)
++        self.fila_4.append(self.btn_M)
++
++        self.btn_coma = self.new_button_escribir(",")
++        self.btn_coma.set_text_desc("coma")
++        self.losBotones.append(self.btn_coma)
++        self.fila_4.append(self.btn_coma)
++
++        self.btn_punto = self.new_button_escribir(".")
++        self.btn_punto.set_text_desc("punto")
++        self.losBotones.append(self.btn_punto)
++        self.fila_4.append(self.btn_punto)
++
++        self.btn_guion = self.new_button_escribir("-")
++        self.btn_guion.set_text_desc("guión")
++        self.losBotones.append(self.btn_guion)
++        self.fila_4.append(self.btn_guion)
++
++        self.btn_A_tilde = self.new_button_escribir("Á")
++        self.btn_A_tilde.set_text_desc("Á tilde")
++        self.losBotones.append(self.btn_A_tilde)
++        self.fila_5.append(self.btn_A_tilde)
++
++        self.btn_E_tilde = self.new_button_escribir("É")
++        self.btn_E_tilde.set_text_desc("É tilde")
++        self.losBotones.append(self.btn_E_tilde)
++        self.fila_5.append(self.btn_E_tilde)
++
++        self.btn_I_tilde = self.new_button_escribir("Í")
++        self.btn_I_tilde.set_text_desc("Í tilde")
++        self.losBotones.append(self.btn_I_tilde)
++        self.fila_5.append(self.btn_I_tilde)
++
++        self.btn_O_tilde = self.new_button_escribir("Ó")
++        self.btn_O_tilde.set_text_desc("Ó tilde")
++        self.losBotones.append(self.btn_O_tilde)
++        self.fila_5.append(self.btn_O_tilde)
++
++        self.btn_U_tilde = self.new_button_escribir("Ú")
++        self.btn_U_tilde.set_text_desc("Ú tilde")
++        self.losBotones.append(self.btn_U_tilde)
++        self.fila_5.append(self.btn_U_tilde)
++
++        self.btn_U_puntos = self.new_button_escribir("Ü")
++        self.btn_U_puntos.set_text_desc("u diéresis")
++        self.losBotones.append(self.btn_U_puntos)
++        self.fila_5.append(self.btn_U_puntos)
++
++        self.btn_pite = self.new_button_escribir("|")
++        self.btn_pite.set_text_desc("pait")
++        self.losBotones.append(self.btn_pite)
++        self.fila_5.append(self.btn_pite)
++
++        self.btn_arroba = self.new_button_escribir("@")
++        self.losBotones.append(self.btn_arroba)
++        self.fila_5.append(self.btn_arroba)
++
++        self.btn_menor = self.new_button_escribir("<")
++        self.btn_menor.set_text_desc("menor")
++        self.losBotones.append(self.btn_menor)
++        self.fila_5.append(self.btn_menor)
++
++        self.btn_opciones = self.new_button(gtk.STOCK_PREFERENCES, " ", self.desplegar_opciones)
++
++        #dibujo tabla
++        table = gtk.Table(7, 19, True)
++
++        table.set_row_spacing(0, 15)
++        table.set_row_spacing(1, 3)
++        table.set_row_spacing(2, 3)
++        table.set_row_spacing(3, 15)
++        table.set_row_spacing(4, 10)
++        table.set_row_spacing(5, 3)
++        table.set_row_spacing(6, 3)
++
++        table.set_col_spacing(0, 3)
++        table.set_col_spacing(1, 3)
++        table.set_col_spacing(2, 3)
++        table.set_col_spacing(3, 3)
++        table.set_col_spacing(4, 3)
++        table.set_col_spacing(5, 3)
++        table.set_col_spacing(6, 3)
++        table.set_col_spacing(7, 3)
++        table.set_col_spacing(8, 3)
++        table.set_col_spacing(9, 3)
++        table.set_col_spacing(10, 3)
++        table.set_col_spacing(11, 3)
++        table.set_col_spacing(12, 3)
++        table.set_col_spacing(13, 15)
++
++
++        table.attach(self.btn_do, 1, 2, 0, 1)
++        table.attach(self.btn_1, 2, 3, 0, 1)
++        table.attach(self.btn_2, 3, 4, 0, 1)
++        table.attach(self.btn_3, 4, 5, 0, 1)
++        table.attach(self.btn_4, 5, 6, 0, 1)
++        table.attach(self.btn_5, 6, 7, 0, 1)
++        table.attach(self.btn_6, 7, 8, 0, 1)
++        table.attach(self.btn_7, 8, 9, 0, 1)
++        table.attach(self.btn_8, 9, 10, 0, 1)
++        table.attach(self.btn_9, 10, 11, 0, 1)
++        table.attach(self.btn_0, 11, 12, 0, 1)
++        table.attach(self.btn_finPreg, 12 ,13, 0, 1)
++        table.attach(self.btn_inicioPreg, 13, 14, 0, 1)
++        table.attach(self.btn_TAB, 0, 2, 1, 2)
++        table.attach(self.btn_Q, 2, 3, 1, 2)
++        table.attach(self.btn_W, 3, 4, 1, 2)
++        table.attach(self.btn_E, 4, 5, 1, 2)
++        table.attach(self.btn_R, 5, 6, 1, 2)
++        table.attach(self.btn_T, 6, 7, 1, 2)
++        table.attach(self.btn_Y, 7, 8, 1, 2)
++        table.attach(self.btn_U, 8, 9, 1, 2)
++        table.attach(self.btn_I, 9, 10, 1, 2)
++        table.attach(self.btn_O, 10, 11, 1, 2)
++        table.attach(self.btn_P, 11, 12, 1, 2)
++        table.attach(self.btn_asterisco, 12, 13, 1, 2)
++        table.attach(self.btn_abre_llave, 13, 14, 1, 2)
++        table.attach(self.btn_A, 2, 3, 2, 3)
++        table.attach(self.btn_S, 3, 4, 2, 3)
++        table.attach(self.btn_D, 4, 5, 2, 3)
++        table.attach(self.btn_F, 5, 6, 2, 3)
++        table.attach(self.btn_G, 6, 7, 2, 3)
++        table.attach(self.btn_H, 7, 8, 2, 3)
++        table.attach(self.btn_J, 8, 9, 2, 3)
++        table.attach(self.btn_K, 9, 10, 2, 3)
++        table.attach(self.btn_L, 10, 11, 2, 3)
++        table.attach(self.btn_enie, 11, 12, 2, 3)
++        table.attach(self.btn_mas, 12, 13, 2, 3)
++        table.attach(self.btn_cierra_llave, 13, 14, 2, 3)
++        table.attach(self.btn_Z, 2, 3, 3, 4)
++        table.attach(self.btn_X, 3, 4, 3, 4)
++        table.attach(self.btn_C, 4, 5, 3, 4)
++        table.attach(self.btn_V, 5, 6, 3, 4)
++        table.attach(self.btn_B, 6, 7, 3, 4)
++        table.attach(self.btn_N, 7, 8, 3, 4)
++        table.attach(self.btn_M, 8, 9, 3, 4)
++        table.attach(self.btn_coma, 9, 10, 3, 4)
++        table.attach(self.btn_punto, 10, 11, 3, 4)
++        table.attach(self.btn_guion, 11, 12, 3, 4)
++
++        table.attach(self.btn_BACK_SPACE, 14, 19, 0, 1)
++        table.attach(self.btn_ENTER, 14, 19, 1, 2)
++        table.attach(self.btn_CAPS_LOCK, 14, 19, 2, 3)
++        table.attach(self.btn_SPACE, 2, 14, 5, 6)
++        table.attach(self.btn_opciones, 18, 19, 5, 6)
++
++        table.attach(self.btn_A_tilde, 2, 3, 4, 5)
++        table.attach(self.btn_E_tilde, 3, 4, 4, 5)
++        table.attach(self.btn_I_tilde, 4, 5, 4, 5)
++        table.attach(self.btn_O_tilde, 5, 6, 4, 5)
++        table.attach(self.btn_U_tilde, 6, 7, 4, 5)
++        table.attach(self.btn_U_puntos, 9, 10, 4, 5)
++        table.attach(self.btn_pite, 10, 11, 4, 5)
++        table.attach(self.btn_arroba, 11, 12, 4, 5)
++        table.attach(self.btn_menor, 12, 13, 4, 5)
++
++        child.pack_end(table, True, True, 0)
++
++        return child
++
++####################################################################################
++    def escribir(self, widget, *arg):
++        txt = widget.get_text()
++
++        self._mTeclado.escribir_txt(txt)
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual=widget
++            self.hablar()
++
++    def espacio(self, *arg):
++        self._mTeclado.escribir_txt(" ")
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual = self.btn_SPACE
++            self.hablar()
++
++    def tab(self, *arg):
++        self._mTeclado.escribir_txt("\t")
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual = self.btn_TAB
++            self.hablar()
++
++    def enter(self, *arg):
++        self._mTeclado.escribir_txt("\n")
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual = self.btn_ENTER
++            self.hablar()
++
++    def borrar(self, *arg):
++        self._mTeclado.escribir_txt("\r")
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual = self.btn_BACK_SPACE
++            self.hablar()
++
++    def new_button_escribir(self, plabel):
++        btn = Boton(plabel)
++        btn.connect("pressed", self.escribir, plabel)
++        btn.connect("activate", self.escribir, plabel)
++        return btn
++
++
++    def new_button_enter(self):
++        btn = Boton("ENTER")
++        btn.set_text_desc("énter")
++        btn.set_font_desc("sans bold 11")
++        btn.connect("pressed", self.enter)
++        btn.connect("activate", self.enter)
++        return btn
++
++    def new_button_espacio(self):
++        btn = Boton("ESPACIO")
++        btn.set_font_desc("sans bold 11")
++        btn.connect("pressed", self.espacio)
++        btn.connect("activate", self.espacio)
++        return btn
++
++    def new_button_borrar(self):
++        btn = Boton("BORRAR")
++        btn.set_font_desc("sans bold 11")
++        btn.connect("pressed", self.borrar)
++        btn.connect("activate", self.borrar)
++        return btn
++
++    def new_button_tab(self):
++        btn = Boton("TAB")
++        btn.set_font_desc("sans bold 11")
++        btn.connect("pressed", self.tab)
++        btn.connect("activate", self.tab)
++        return btn
++
++    def new_button_mayuscula(self):
++        btn = Boton("MINÚSCULA")
++        btn.set_font_desc("sans bold 11")
++        btn.connect("pressed", self.set_mayuscula)
++        btn.connect("activate", self.set_mayuscula)
++        return btn
++
++    def new_button_cambiar_tipo(self, titulo):
++        btn = Boton(titulo)
++        btn.set_font_desc("sans 9")
++        btn.connect("pressed", self.cambiar_tipo)
++        btn.connect("activate", self.cambiar_tipo)
++        return btn
++
++
++    def set_mayuscula(self, *arg):
++        if (self.MAYUSCULA):
++            self.btn_do.set_text("ª")
++            self.btn_do.set_text_desc("a superíndice")
++            self.btn_1.set_text("!")
++            self.btn_1.set_text_desc("cierro exclamación")
++            self.btn_2.set_text("\"")
++            self.btn_2.set_text_desc("comilla doble")
++            self.btn_3.set_text("#")
++            self.btn_3.set_text_desc("numeral")
++            self.btn_4.set_text("$")
++            self.btn_4.set_text_desc("peso")
++            self.btn_5.set_text("%")
++            self.btn_5.set_text_desc("porcentaje")
++            self.btn_6.set_text("&")
++            self.btn_6.set_text_desc("ámpersand")
++            self.btn_7.set_text("/")
++            self.btn_7.set_text_desc("barra")
++            self.btn_8.set_text("(")
++            self.btn_8.set_text_desc("abro paréntesis")
++            self.btn_9.set_text(")")
++            self.btn_9.set_text_desc("cierro paréntesis")
++            self.btn_0.set_text("=")
++            self.btn_0.set_text_desc("igual")
++            self.btn_finPreg.set_text("?")
++            self.btn_finPreg.set_text_desc("cierro pregunta")
++            self.btn_inicioPreg.set_text("¿")
++            self.btn_inicioPreg.set_text_desc("abro pregunta")
++            self.btn_Q.set_text("q")
++            self.btn_W.set_text("w")
++            self.btn_E.set_text("e")
++            self.btn_R.set_text("r")
++            self.btn_T.set_text("t")
++            self.btn_Y.set_text("y")
++            self.btn_U.set_text("u")
++            self.btn_I.set_text("i")
++            self.btn_O.set_text("o")
++            self.btn_P.set_text("p")
++            self.btn_A.set_text("a")
++            self.btn_S.set_text("s")
++            self.btn_D.set_text("d")
++            self.btn_F.set_text("f")
++            self.btn_G.set_text("g")
++            self.btn_H.set_text("h")
++            self.btn_J.set_text("j")
++            self.btn_K.set_text("k")
++            self.btn_L.set_text("l")
++            self.btn_enie.set_text("ñ")
++            self.btn_menor.set_text(">")
++            self.btn_menor.set_text_desc("mayor")
++            self.btn_Z.set_text("z")
++            self.btn_X.set_text("x")
++            self.btn_C.set_text("c")
++            self.btn_V.set_text("v")
++            self.btn_B.set_text("b")
++            self.btn_N.set_text("n")
++            self.btn_M.set_text("m")
++            self.btn_coma.set_text(";")
++            self.btn_coma.set_text_desc("punto y coma")
++            self.btn_punto.set_text(":")
++            self.btn_punto.set_text_desc("dos puntos")
++            self.btn_guion.set_text("_")
++            self.btn_guion.set_text_desc("guión bajo")
++            self.btn_A_tilde.set_text("á")
++            self.btn_A_tilde.set_text_desc("á tilde")
++            self.btn_E_tilde.set_text("é")
++            self.btn_E_tilde.set_text_desc("é tilde")
++            self.btn_I_tilde.set_text("í")
++            self.btn_I_tilde.set_text_desc("í tilde")
++            self.btn_O_tilde.set_text("ó")
++            self.btn_O_tilde.set_text_desc("ó tilde")
++            self.btn_U_tilde.set_text("ú")
++            self.btn_U_tilde.set_text_desc("ú tilde")
++            self.btn_U_puntos.set_text("ü")
++            self.btn_U_puntos.set_text_desc("u diéresis")
++            self.btn_abre_llave.set_text("{")
++            self.btn_abre_llave.set_text_desc("abro llave")
++            self.btn_cierra_llave.set_text("}")
++            self.btn_cierra_llave.set_text_desc("cierro llave")
++
++            self.MAYUSCULA = False
++            self.btn_CAPS_LOCK.set_text("MAYÚSCULA")
++            self.btn_CAPS_LOCK.set_text_desc("MAYÚSCULA")
++        else:
++            self.btn_do.set_text("º")
++            self.btn_do.set_text_desc("o superíndice")
++            self.btn_1.set_text("1")
++            self.btn_1.set_text_desc("1")
++            self.btn_2.set_text("2")
++            self.btn_2.set_text_desc("2")
++            self.btn_3.set_text("3")
++            self.btn_3.set_text_desc("3")
++            self.btn_4.set_text("4")
++            self.btn_4.set_text_desc("4")
++            self.btn_5.set_text("5")
++            self.btn_5.set_text_desc("5")
++            self.btn_6.set_text("6")
++            self.btn_6.set_text_desc("6")
++            self.btn_7.set_text("7")
++            self.btn_7.set_text_desc("7")
++            self.btn_8.set_text("8")
++            self.btn_8.set_text_desc("8")
++            self.btn_9.set_text("9")
++            self.btn_9.set_text_desc("9")
++            self.btn_0.set_text("0")
++            self.btn_0.set_text_desc("0")
++            self.btn_finPreg.set_text("'")
++            self.btn_finPreg.set_text_desc("comilla simple")
++            self.btn_inicioPreg.set_text("¡")
++            self.btn_inicioPreg.set_text_desc("abro exclamación")
++            self.btn_Q.set_text("Q")
++            self.btn_W.set_text("W")
++            self.btn_E.set_text("E")
++            self.btn_R.set_text("R")
++            self.btn_T.set_text("T")
++            self.btn_Y.set_text("Y")
++            self.btn_U.set_text("U")
++            self.btn_I.set_text("I")
++            self.btn_O.set_text("O")
++            self.btn_P.set_text("P")
++            self.btn_A.set_text("A")
++            self.btn_S.set_text("S")
++            self.btn_D.set_text("D")
++            self.btn_F.set_text("F")
++            self.btn_G.set_text("G")
++            self.btn_H.set_text("H")
++            self.btn_J.set_text("J")
++            self.btn_K.set_text("K")
++            self.btn_L.set_text("L")
++            self.btn_enie.set_text("Ñ")
++            self.btn_menor.set_text("<")
++            self.btn_menor.set_text_desc("menor")
++            self.btn_Z.set_text("Z")
++            self.btn_X.set_text("X")
++            self.btn_C.set_text("C")
++            self.btn_V.set_text("V")
++            self.btn_B.set_text("B")
++            self.btn_N.set_text("N")
++            self.btn_M.set_text("M")
++            self.btn_coma.set_text(",")
++            self.btn_coma.set_text_desc("coma")
++            self.btn_punto.set_text(".")
++            self.btn_punto.set_text_desc("punto")
++            self.btn_guion.set_text("-")
++            self.btn_guion.set_text_desc("guión")
++            self.btn_A_tilde.set_text("Á")
++            self.btn_A_tilde.set_text_desc("Á tilde")
++            self.btn_E_tilde.set_text("É")
++            self.btn_E_tilde.set_text_desc("É tilde")
++            self.btn_I_tilde.set_text("Í")
++            self.btn_I_tilde.set_text_desc("Í tilde")
++            self.btn_O_tilde.set_text("Ó")
++            self.btn_O_tilde.set_text_desc("Ó tilde")
++            self.btn_U_tilde.set_text("Ú")
++            self.btn_U_tilde.set_text_desc("Ú tilde")
++            self.btn_U_puntos.set_text("Ü")
++            self.btn_U_puntos.set_text_desc("u diéresis")
++            self.btn_abre_llave.set_text("[")
++            self.btn_abre_llave.set_text_desc("abro paréntesis recto")
++            self.btn_cierra_llave.set_text("]")
++            self.btn_cierra_llave.set_text_desc("abro paréntesis recto")
++
++
++            self.MAYUSCULA = True
++            self.btn_CAPS_LOCK.set_text("MINÚSCULA")
++            self.btn_CAPS_LOCK.set_text_desc("MINÚSCULA")
++        if (self.hablar_al == "ESCRIBIR"):
++            self.btn_actual = self.btn_CAPS_LOCK
++            self.hablar()
++
++########################################################################
++
++    def set_botonesXbarridoXfila(self, widget):
++        state = widget.get_active()
++        if state:
++            self.BOTONESxBARRIDOxFILA = True
++            self.grabar_barrido("SI")
++            self.BOTONESxBARRIDO = False #nuevo
++            self.botonesXbarridoXfila()
++        else:
++            if (self.BOTONESxBARRIDOxFILA):
++                self.BOTONESxBARRIDOxFILA = False
++                self.iluminarFila(self.fila_actual_nro, "white")
++            self.iluminarBoton(self.btn_actual, "white")
++            self.BOTONESxBARRIDO = False
++            self.grabar_barrido("NO")
++
++    def botonesXbarridoXfila(self):
++        gobject.timeout_add(self.seg, self.barrerFocusXfila1)
++
++    def barrerFocusXfila1(self, *arg):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.fila_actual_nro = 1
++        self.fila_actual = self.fila_1
++        self.iluminarBoton(self.btn_actual, "white") #nuevo, sacarlo
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarFila(1, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            if (not self.fila_2 == []):
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE,1, 2)
++            else:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila1)
++
++    def barrer_el_boton(self, btn , fila_anterior, fila_a_seguir):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++
++        self.fila_actual_nro = -1
++        self.fila_actual = None
++        self.btn_actual = btn
++        self.iluminarFila(fila_anterior, "white")
++
++        if (self.hablar_al == "BARRER"):
++            self.hablar()
++
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarBoton(self.btn_actual, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            if fila_a_seguir==1:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila1)
++            if fila_a_seguir==2:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila2)
++            if fila_a_seguir==3:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila3)
++            if fila_a_seguir==4:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila4)
++            if fila_a_seguir==5:
++                gobject.timeout_add(self.seg, self.barrerFocusXfila5)
++
++
++
++    def barrerFocusXfila2(self, *arg):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarBoton(self.btn_actual, "white")
++        self.fila_actual_nro = 2
++        self.fila_actual = self.fila_2
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarFila(2, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            if (not self.fila_3 == []):
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE,2, 3)
++            else:
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE,2, 1)
++
++
++    def barrerFocusXfila3(self, *arg):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.fila_actual_nro = 3
++        self.fila_actual = self.fila_3
++        self.iluminarBoton(self.btn_actual, "white")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarFila(3, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            if (not self.fila_4 == []):
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE, 3, 4)
++            else:
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE, 3, 1)
++
++
++    def barrerFocusXfila4(self, *arg):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.fila_actual_nro = 4
++        self.fila_actual = self.fila_4
++        self.iluminarBoton(self.btn_actual, "white")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarFila(4, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            if (not self.fila_5 == []):
++                gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE, 4, 5)
++            else:
++                if (self.teclado_tipo=="LETRAS" or self.teclado_tipo=="COMPLETO"):
++                    gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_SPACE, 4, 1)
++                else:
++                    gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_BACK_SPACE, 4, 1)
++
++
++    def barrerFocusXfila5(self, *arg):
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.fila_actual_nro = 5
++        self.fila_actual = self.fila_5
++        self.iluminarBoton(self.btn_actual, "white")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        self.iluminarFila(5, "Yellow")
++        if not self.BOTONESxBARRIDOxFILA:
++            return False
++        if self.BOTONESxBARRIDOxFILA:
++            gobject.timeout_add(self.seg, self.barrer_el_boton, self.btn_SPACE, 5, 1)
++
++
++    def iluminarFila(self, fila, color):
++        if fila == 1:
++            for f in range(0,len(self.fila_1)):
++                gobject.idle_add(self.pintarControl,self.fila_1[f], color)
++        if fila == 2:
++            for f in range(0,len(self.fila_2)):
++                gobject.idle_add(self.pintarControl,self.fila_2[f], color)
++        if fila == 3:
++            for f in range(0,len(self.fila_3)):
++                gobject.idle_add(self.pintarControl,self.fila_3[f], color)
++        if fila == 4:
++            for f in range(0,len(self.fila_4)):
++                gobject.idle_add(self.pintarControl,self.fila_4[f], color)
++        if fila == 5:
++            for f in range(0,len(self.fila_5)):
++                gobject.idle_add(self.pintarControl,self.fila_5[f], color)
++
++    def pintarControl(self, w, color):
++        if not w == None:
++            w.modify_bg( gtk.STATE_NORMAL, gtk.gdk.color_parse(color))
++
++    def mouse_boton(self, widget, event):
++        #evita repetición
++        self.bloquearHandler()
++
++        if self.BOTONESxBARRIDO:
++            self.BOTONESxBARRIDO=False
++            self.btn_actual.emit("pressed")
++            #voler a empezar...
++            self.iluminarBoton(self.btn_actual, "white")
++            self.BOTONESxBARRIDOxFILA = True
++            self.botonesXbarridoXfila()
++            return
++        if self.BOTONESxBARRIDOxFILA:
++            if self.fila_actual_nro==-1: #es un boton
++                self.btn_actual.emit("pressed")
++                self.iluminarBoton(self.btn_actual, "white") #nuevo
++            else:
++                self.BOTONESxBARRIDOxFILA = False;
++                self.iluminarFila(self.fila_actual_nro, "white")
++                self.BOTONESxBARRIDO = True;
++                self.botonesXbarridoEnFila()
++
++
++
++    def iluminarBoton(self, btn, color):
++        gobject.idle_add(self.pintarControl,btn, color)
++
++    def bloquearHandler(self):
++        self.hilo_bloquear = threading.Thread(target = self.bloquearHandler_aux_obj)
++        self.hilo_bloquear.start()
++        self.hilo_bloquear.quit = True
++
++    def bloquearHandler_aux_obj(self):
++        self.event_box.handler_block(self.ebc)
++        try:
++            seg=self.get_time_barrido_botones()
++        except:
++            seg = velocidades['media']
++
++        s = seg/1000
++        if self.BOTONESxBARRIDOxFILA:
++            if self.fila_actual_nro==-1: #es un boton
++                if seg == velocidades['rapida']:
++                    s = s - 0.5
++                else:
++                    s = s - 1
++        time.sleep(s)
++        self.event_box.handler_unblock(self.ebc)
++
++
++    def botonesXbarridoEnFila(self):
++        gobject.idle_add(self.barrerEnFila)
++
++    def barrerEnFila(self):
++        if self.BOTONESxBARRIDO:
++            i=0
++            gobject.timeout_add(self.seg, self.barrerEnFila_aux, i)
++
++    def barrerEnFila_aux(self, i):
++        if not self.BOTONESxBARRIDO:
++            return False
++        try:
++            self.btn_ant = self.fila_actual[i-1]
++        except:
++            return False
++        try:
++            self.btn_actual = self.fila_actual[i]
++        except:
++            self.BOTONESxBARRIDO = False
++            self.BOTONESxBARRIDOxFILA = True
++            self.botonesXbarridoXfila()
++            return False
++        if not self.BOTONESxBARRIDO:
++            return False
++        self.iluminarBoton(self.btn_ant, "white")
++        if not self.BOTONESxBARRIDO:
++            return False
++        self.iluminarBoton(self.btn_actual, "Yellow")
++
++        if (self.hablar_al == "BARRER"):
++            self.hablar()
++
++        if not self.BOTONESxBARRIDO:
++            return False
++        else:
++            gobject.timeout_add(self.seg, self.barrerEnFila_aux, i+1)
++
++
++    def combo_tiempos_botones(self):
++        cb = gtk.combo_box_new_text()
++        cb.append_text("RÁPIDO")
++        cb.append_text("MEDIO")
++        cb.append_text("LENTO")
++        seg = velocidades['media']
++        try:
++            seg = self.get_time_barrido_botones()
++            logging.debug('seg : ' + seg)
++        except:
++            logging.debug("ERROR al leer velocidad de barrido de botones")
++
++        if seg==velocidades['rapida']:
++            cb.set_active(0)
++        if seg==velocidades['media']:
++            cb.set_active(1)
++        if seg==velocidades['lenta']:
++            cb.set_active(2)
++
++        cb.connect("changed", self.on_changed_cbo_time_btn)
++        return cb
++
++
++    def combo_size_botones(self):
++        cb = gtk.combo_box_new_text()
++        cb.append_text("CHICO")
++        cb.append_text("MEDIANO")
++        cb.append_text("GRANDE")
++        size="CHICO"
++        try:
++            size = self.get_size_botones()
++        except:
++            logging.debug("ERROR, al leer size de botones")
++
++        if size=="CHICO":
++            cb.set_active(0)
++        if size=="MEDIANO":
++            cb.set_active(1)
++        if size=="GRANDE":
++            cb.set_active(2)
++
++        cb.connect("changed", self.on_changed_cbo_size_btn)
++        return cb
++
++    def combo_tipo_teclados(self):
++        cb = gtk.combo_box_new_text()
++        cb.append_text("COMPLETO")
++        cb.append_text("NUMÉRICO")
++        cb.append_text("LETRAS")
++        tipo="COMPLETO"
++        try:
++            tipo = self.get_tipo_teclado()
++        except:
++            logging.debug("ERROR, al leer tipo de teclado")
++
++        if tipo=="COMPLETO":
++            cb.set_active(0)
++        if tipo=="NUMERICO":
++            cb.set_active(1)
++        if tipo=="LETRAS":
++            cb.set_active(2)
++
++        cb.connect("changed", self.on_changed_cbo_tipo_teclados)
++        return cb
++
++    def on_changed_cbo_tipo_teclados(self, widget):
++        s = widget.get_active()
++
++        if s==0:
++            tipo = "COMPLETO"
++        if s==1:
++            tipo = "NUMERICO"
++        if s==2:
++            tipo = "LETRAS"
++
++        self.set_tipo_teclado(tipo)
++
++        self.hilo_type = threading.Thread(target = self.reset)
++        self.hilo_type.start()
++        self.hilo_type.quit = True
++
++        self.dialog_opciones.destroy()
++        self.close()
++
++
++    def on_changed_cbo_size_btn(self, widget):
++        s = widget.get_active()
++
++        if s==0:
++            size = "CHICO"
++        if s==1:
++            size = "MEDIANO"
++        if s==2:
++            size = "GRANDE"
++
++        self.set_size_botones(size)
++
++        self.hilo_size = threading.Thread(target = self.reset)
++        self.hilo_size.start()
++        self.hilo_size.quit = True
++
++        self.dialog_opciones.destroy()
++        self.close()
++
++
++    def on_changed_cbo_time_btn(self, widget):
++        s = widget.get_active()
++
++        if s==0:
++            seg = velocidades['rapida']
++        if s==1:
++            seg = velocidades['media']
++        if s==2:
++            seg = velocidades['lenta']
++
++        self.set_time_barrido_botones(seg)
++        self.seg=seg
++
++
++
++    def get_time_barrido_botones(self):
++        client = gconf.client_get_default()
++        return client.get_int("/desktop/sugar/virtualkeyboard/time")
++
++    def set_time_barrido_botones(self, seg):
++        client = gconf.client_get_default()
++        client.set_int("/desktop/sugar/virtualkeyboard/time", seg)
++
++    def get_size_botones(self):
++        client = gconf.client_get_default()
++        return client.get_string("/desktop/sugar/virtualkeyboard/size")
++
++    def set_size_botones(self, size):
++        client = gconf.client_get_default()
++        client.set_string("/desktop/sugar/virtualkeyboard/size", size)
++
++    def set_hablar(self, hablar):
++        client = gconf.client_get_default()
++        client.set_string("/desktop/sugar/virtualkeyboard/hablar", hablar)
++        self.hablar_al = hablar
++
++    def get_tipo_teclado(self):
++        client = gconf.client_get_default()
++        return client.get_string("/desktop/sugar/virtualkeyboard/tipo")
++
++    def set_tipo_teclado(self, tipo):
++        client = gconf.client_get_default()
++        client.set_string("/desktop/sugar/virtualkeyboard/tipo", tipo)
++
++    def leer_barrido(self):
++        client = gconf.client_get_default()
++        return client.get_string("/desktop/sugar/virtualkeyboard/barrido")
++
++
++    def grabar_barrido(self, barrido):
++        client = gconf.client_get_default()
++        client.set_string("/desktop/sugar/virtualkeyboard/barrido", barrido)
++
++    def get_opciones_hablar(self):
++        client = gconf.client_get_default()
++        return client.get_string("/desktop/sugar/virtualkeyboard/hablar")
++
++    def set_opciones_hablar(self, widget, data=None):
++        if (widget.get_active()):
++            self.set_hablar(data)
++
++    def inicilizar_config(self):
++        client = gconf.client_get_default()
++        if not client.dir_exists("/desktop/sugar/virtualkeyboard"):
++            self.set_time_barrido_botones(self.seg)
++            self.set_size_botones(self.size)
++            self.set_hablar(self.hablar_al)
++            self.set_tipo_teclado(self.teclado_tipo)
++            if self.BOTONESxBARRIDOxFILA:
++                self.grabar_barrido("SI")
++            else:
++                self.grabar_barrido("NO")
++
++    def new_button(self, icon, label, callbackstr):
++        btn = Boton(label)
++        btn.set_font_desc("sans 9")
++        btn.connect("pressed", callbackstr)
++        if (not icon == None):
++            btn.set_icon(icon)
++        return btn
++
++
++    def sizeBotones(self, desc):
++        for btn in self.losBotones:
++            btn.set_font_desc(desc)
++
++    def reset(self):
++        self.close()
++        Teclado()
++
++    def hablar(self):
++        self.hilo_hablar = threading.Thread(target=self.hablar_aux)
++        self.hilo_hablar.start()
++        self.hilo_hablar.quit=True
++
++    def hablar_aux(self):
++        texto = ""
++        v = ""
++        try:
++            texto = self.btn_actual.get_text_desc()
++        except:
++            return
++        if (not texto == ""):
++            try:
++                seg=self.get_time_barrido_botones()
++            except:
++                seg = velocidades['media']
++            if seg == velocidades['rapida']:
++                v = hablar['rapida']
++            if seg == velocidades['media']:
++                v = hablar['media']
++            if seg == velocidades['lenta']:
++                v = hablar['lenta']
++            self._mTeclado.hablar(texto, v)
++
++    def desplegar_opciones(self, *arg):
++        try:
++            if (self.dialog_opciones.get_property('visible')):
++                return
++        except:
++            pass
++
++        self.dialog_opciones = gtk.Dialog()
++        self.dialog_opciones.set_title("OPCIONES")
++        self.dialog_opciones.set_keep_above(True)
++
++        #opciones hablar
++        box_hablar = gtk.VBox(False, 10)
++        box_hablar.set_border_width(20)
++
++        button = gtk.RadioButton(None, "HABLAR AL BARRER BOTONES.")
++        button.connect("toggled", self.set_opciones_hablar, "BARRER")
++        if (self.get_opciones_hablar()=="BARRER"):
++            button.set_active(True)
++        box_hablar.pack_start(button, True, True, 0)
++        button = gtk.RadioButton(button, "HABLAR AL ESCRIBIR.")
++        button.connect("toggled", self.set_opciones_hablar, "ESCRIBIR")
++        if (self.get_opciones_hablar()=="ESCRIBIR"):
++            button.set_active(True)
++        box_hablar.pack_start(button, True, True, 0)
++        button = gtk.RadioButton(button, "NO HABLAR.")
++        button.connect("toggled", self.set_opciones_hablar, "NUNCA")
++        if (self.get_opciones_hablar()=="NUNCA"):
++            button.set_active(True)
++        box_hablar.pack_start(button, True, True, 0)
++        self.dialog_opciones.vbox.pack_start(box_hablar, True, True, 0)
++
++        separator_hablar = gtk.HSeparator()
++        self.dialog_opciones.vbox.pack_start(separator_hablar, expand=False)
++        separator_hablar.show()
++
++        #opciones de barrido
++        box_barrido = gtk.VBox(False, 10)
++        box_barrido.set_border_width(20)
++
++        lbl_op_botones = gtk.Label("Barrer:")
++        lbl_op_botones.show()
++        box_barrido.pack_start(lbl_op_botones, True, True, 0)
++
++        self.chk_activarBarrido_botones = gtk.CheckButton("_BOTONES")
++
++        barriendo= ""
++        try:
++            barriendo = self.leer_barrido()
++        except:
++            barriendo == "NO"
++        if barriendo == "SI":
++            self.BOTONESxBARRIDOxFILA = True
++        elif barriendo == "NO":
++            self.BOTONESxBARRIDOxFILA = False
++        else:
++            logging.error("Error al leer barrido." + str(barriendo))
++
++
++        self.chk_activarBarrido_botones.set_active(self.BOTONESxBARRIDOxFILA or self.BOTONESxBARRIDO)
++        self.chk_activarBarrido_botones.connect("toggled", self.set_botonesXbarridoXfila)
++        box_barrido.pack_start(self.chk_activarBarrido_botones, True, True, 0)
++
++        lbl_op_velocidad = gtk.Label("Velocidad:")
++        lbl_op_velocidad.show()
++        box_barrido.pack_start(lbl_op_velocidad, True, True, 0)
++
++        self.cbo_time_btn = self.combo_tiempos_botones()
++        box_barrido.pack_start(self.cbo_time_btn, True, True, 0)
++        self.dialog_opciones.vbox.pack_start(box_barrido, True, True, 0)
++
++        separator_barrido = gtk.HSeparator()
++        self.dialog_opciones.vbox.pack_start(separator_barrido, expand=False)
++        separator_barrido.show()
++
++        #opciones de tamaño
++        box_size = gtk.VBox(False, 10)
++        box_size.set_border_width(20)
++
++        lbl_op_size = gtk.Label("Tamaño:")
++        lbl_op_size.show()
++        box_size.pack_start(lbl_op_size, True, True, 0)
++
++        self.cbo_size_btn = self.combo_size_botones()
++        box_size.pack_start(self.cbo_size_btn, True, True, 0)
++        self.dialog_opciones.vbox.pack_start(box_size, True, True, 0)
++
++        separator_size = gtk.HSeparator()
++        self.dialog_opciones.vbox.pack_start(separator_size, expand=False)
++        separator_size.show()
++
++        #tipo
++        box_teclado = gtk.VBox(False, 10)
++        box_teclado.set_border_width(20)
++
++        lbl_op_tipo = gtk.Label("Tipo:")
++        lbl_op_tipo.show()
++        box_teclado.pack_start(lbl_op_tipo, True, True, 0)
++
++        self.cbo_tipo_teclado = self.combo_tipo_teclados()
++        box_teclado.pack_start(self.cbo_tipo_teclado, True, True, 0)
++        self.dialog_opciones.vbox.pack_start(box_teclado, True, True, 0)
++
++        separator_tipo = gtk.HSeparator()
++        self.dialog_opciones.vbox.pack_start(separator_tipo, expand=False)
++        separator_tipo.show()
++
++        self.dialog_opciones.show_all()
++
++
++
++    def set_opciones_hablar(self, widget, data=None):
++        if (widget.get_active()):
++            self.set_hablar(data)
++################################################################################################################
++    def mostrar_teclado_numerico(self):
++        child = gtk.VBox(False, 2)
++
++        self.fila_1 = []
++        self.fila_2 = []
++        self.fila_3 = []
++        self.fila_4 = []
++        self.fila_5 = []
++        self.losBotones = []
++
++        # defino botones
++        self.btn_BACK_SPACE = self.new_button_borrar()
++        self.losBotones.append(self.btn_BACK_SPACE)
++
++        self.btn_1 = self.new_button_escribir("1")
++        self.losBotones.append(self.btn_1)
++        self.fila_3.append(self.btn_1)
++
++        self.btn_2 = self.new_button_escribir("2")
++        self.losBotones.append(self.btn_2)
++        self.fila_3.append(self.btn_2)
++
++        self.btn_3 = self.new_button_escribir("3")
++        self.losBotones.append(self.btn_3)
++        self.fila_3.append(self.btn_3)
++
++        self.btn_4 = self.new_button_escribir("4")
++        self.losBotones.append(self.btn_4)
++        self.fila_2.append(self.btn_4)
++
++        self.btn_5 = self.new_button_escribir("5")
++        self.losBotones.append(self.btn_5)
++        self.fila_2.append(self.btn_5)
++
++        self.btn_6 = self.new_button_escribir("6")
++        self.losBotones.append(self.btn_6)
++        self.fila_2.append(self.btn_6)
++
++        self.btn_7 = self.new_button_escribir("7")
++        self.losBotones.append(self.btn_7)
++        self.fila_1.append(self.btn_7)
++
++        self.btn_8 = self.new_button_escribir("8")
++        self.losBotones.append(self.btn_8)
++        self.fila_1.append(self.btn_8)
++
++        self.btn_9 = self.new_button_escribir("9")
++        self.losBotones.append(self.btn_9)
++        self.fila_1.append(self.btn_9)
++
++        self.btn_0 = self.new_button_escribir("0")
++        self.losBotones.append(self.btn_0)
++        self.fila_4.append(self.btn_0)
++
++        self.btn_asterisco = self.new_button_escribir("*")
++        self.btn_asterisco.set_text_desc("por")
++        self.losBotones.append(self.btn_asterisco)
++        self.fila_3.append(self.btn_asterisco)
++
++        self.btn_barra = self.new_button_escribir("/")
++        self.btn_barra.set_text_desc("dividido")
++        self.losBotones.append(self.btn_barra)
++        self.fila_3.append(self.btn_barra)
++
++        self.btn_mas = self.new_button_escribir("+")
++        self.btn_mas.set_text_desc("más")
++        self.losBotones.append(self.btn_mas)
++        self.fila_2.append(self.btn_mas)
++
++        self.btn_punto = self.new_button_escribir(".")
++        self.btn_punto.set_text_desc("punto")
++        self.losBotones.append(self.btn_punto)
++        self.fila_4.append(self.btn_punto)
++
++        self.btn_guion = self.new_button_escribir("-")
++        self.btn_guion.set_text_desc("menos")
++        self.losBotones.append(self.btn_guion)
++        self.fila_2.append(self.btn_guion)
++
++        self.btn_ENTER = self.new_button_enter()
++        self.losBotones.append(self.btn_ENTER)
++        self.fila_4.append(self.btn_ENTER)
++
++        self.btn_opciones = self.new_button(gtk.STOCK_PREFERENCES, None ,self.desplegar_opciones)
++        self.btn_cambiar_tipo = self.new_button_cambiar_tipo("ABC")
++        self.fila_4.append(self.btn_cambiar_tipo)
++
++        table = gtk.Table(6, 11, True)
++
++        table.set_row_spacing(0, 3)
++        table.set_row_spacing(1, 3)
++        table.set_row_spacing(2, 3)
++        table.set_row_spacing(3, 3)
++        table.set_row_spacing(4, 3)
++        table.set_row_spacing(5, 3)
++
++        table.set_col_spacing(0, 3)
++        table.set_col_spacing(1, 3)
++        table.set_col_spacing(2, 3)
++        table.set_col_spacing(3, 3)
++        table.set_col_spacing(4, 3)
++        table.set_col_spacing(5, 15)
++        table.set_col_spacing(6, 3)
++        table.set_col_spacing(7, 3)
++        table.set_col_spacing(8, 3)
++        table.set_col_spacing(9, 3)
++        table.set_col_spacing(10, 15)
++
++        table.attach(self.btn_7, 0, 2, 0, 2)
++        table.attach(self.btn_8, 2, 4, 0, 2)
++        table.attach(self.btn_9, 4, 6, 0, 2)
++        table.attach(self.btn_BACK_SPACE, 6, 10, 0, 2)
++
++        table.attach(self.btn_4, 0, 2, 2, 4)
++        table.attach(self.btn_5, 2, 4, 2, 4)
++        table.attach(self.btn_6, 4, 6, 2, 4)
++        table.attach(self.btn_mas, 6, 8, 2, 4)
++        table.attach(self.btn_guion, 8, 10, 2, 4)
++
++        table.attach(self.btn_1, 0, 2, 4, 6)
++        table.attach(self.btn_2, 2, 4, 4, 6)
++        table.attach(self.btn_3, 4, 6, 4, 6)
++        table.attach(self.btn_asterisco, 6, 8, 4, 6)
++        table.attach(self.btn_barra, 8, 10, 4, 6)
++
++        table.attach(self.btn_0, 0, 2, 6, 8)
++        table.attach(self.btn_punto, 2, 4, 6, 8)
++        table.attach(self.btn_ENTER, 6, 10, 6, 8)
++
++        table.attach(self.btn_opciones, 10, 11, 6, 7)
++        table.attach(self.btn_cambiar_tipo, 10, 11, 7, 8)
++
++
++        child.pack_end(table, True, True, 0)
++
++        return child
++
++    def posicionar_dialog(self, dialog):
++        dialog.set_gravity(gtk.gdk.GRAVITY_SOUTH_EAST)
++        width, height = dialog.get_size()
++        dialog.move(gtk.gdk.screen_width() - width, gtk.gdk.screen_height() - height)
++
++    def mostrar_teclado_letras(self):
++        self.fila_1 = []
++        self.fila_2 = []
++        self.fila_3 = []
++        self.fila_4 = []
++        self.fila_5 = []
++        self.losBotones = []
++
++        child = gtk.VBox(False, 2)
++
++        # defino botones
++        self.btn_BACK_SPACE = self.new_button_borrar()
++        self.losBotones.append(self.btn_BACK_SPACE)
++
++        self.btn_SPACE = self.new_button_espacio()
++        self.losBotones.append(self.btn_SPACE)
++
++        self.btn_ENTER = self.new_button_enter()
++        self.losBotones.append(self.btn_ENTER)
++        self.fila_2.append(self.btn_ENTER)
++
++        self.btn_Q = self.new_button_escribir("Q")
++        self.losBotones.append(self.btn_Q)
++        self.fila_1.append(self.btn_Q)
++
++        self.btn_W = self.new_button_escribir("W")
++        self.losBotones.append(self.btn_W)
++        self.fila_1.append(self.btn_W)
++
++        self.btn_E = self.new_button_escribir("E")
++        self.losBotones.append(self.btn_E)
++        self.fila_1.append(self.btn_E)
++
++        self.btn_R = self.new_button_escribir("R")
++        self.losBotones.append(self.btn_R)
++        self.fila_1.append(self.btn_R)
++
++        self.btn_T = self.new_button_escribir("T")
++        self.losBotones.append(self.btn_T)
++        self.fila_1.append(self.btn_T)
++
++        self.btn_Y = self.new_button_escribir("Y")
++        self.losBotones.append(self.btn_Y)
++        self.fila_1.append(self.btn_Y)
++
++        self.btn_U = self.new_button_escribir("U")
++        self.losBotones.append(self.btn_U)
++        self.fila_1.append(self.btn_U)
++
++        self.btn_I = self.new_button_escribir("I")
++        self.losBotones.append(self.btn_I)
++        self.fila_1.append(self.btn_I)
++
++        self.btn_O = self.new_button_escribir("O")
++        self.losBotones.append(self.btn_O)
++        self.fila_1.append(self.btn_O)
++
++        self.btn_P = self.new_button_escribir("P")
++        self.losBotones.append(self.btn_P)
++        self.fila_1.append(self.btn_P)
++
++        self.btn_A = self.new_button_escribir("A")
++        self.losBotones.append(self.btn_A)
++        self.fila_2.append(self.btn_A)
++
++        self.btn_S = self.new_button_escribir("S")
++        self.losBotones.append(self.btn_S)
++        self.fila_2.append(self.btn_S)
++
++        self.btn_D = self.new_button_escribir("D")
++        self.losBotones.append(self.btn_D)
++        self.fila_2.append(self.btn_D)
++
++        self.btn_F = self.new_button_escribir("F")
++        self.losBotones.append(self.btn_F)
++        self.fila_2.append(self.btn_F)
++
++        self.btn_G = self.new_button_escribir("G")
++        self.losBotones.append(self.btn_G)
++        self.fila_2.append(self.btn_G)
++
++        self.btn_H = self.new_button_escribir("H")
++        self.losBotones.append(self.btn_H)
++        self.fila_2.append(self.btn_H)
++
++        self.btn_J = self.new_button_escribir("J")
++        self.losBotones.append(self.btn_J)
++        self.fila_2.append(self.btn_J)
++
++        self.btn_K = self.new_button_escribir("K")
++        self.losBotones.append(self.btn_K)
++        self.fila_2.append(self.btn_K)
++
++        self.btn_L = self.new_button_escribir("L")
++        self.losBotones.append(self.btn_L)
++        self.fila_2.append(self.btn_L)
++
++        self.btn_enie = self.new_button_escribir("Ñ")
++        self.losBotones.append(self.btn_enie)
++        self.fila_2.append(self.btn_enie)
++
++        self.btn_Z = self.new_button_escribir("Z")
++        self.losBotones.append(self.btn_Z)
++        self.fila_3.append(self.btn_Z)
++
++        self.btn_X = self.new_button_escribir("X")
++        self.losBotones.append(self.btn_X)
++        self.fila_3.append(self.btn_X)
++
++        self.btn_C = self.new_button_escribir("C")
++        self.losBotones.append(self.btn_C)
++        self.fila_3.append(self.btn_C)
++
++        self.btn_V = self.new_button_escribir("V")
++        self.losBotones.append(self.btn_V)
++        self.fila_3.append(self.btn_V)
++
++        self.btn_B = self.new_button_escribir("B")
++        self.losBotones.append(self.btn_B)
++        self.fila_3.append(self.btn_B)
++
++        self.btn_N = self.new_button_escribir("N")
++        self.losBotones.append(self.btn_N)
++        self.fila_3.append(self.btn_N)
++
++        self.btn_M = self.new_button_escribir("M")
++        self.losBotones.append(self.btn_M)
++        self.fila_3.append(self.btn_M)
++
++        self.btn_A_tilde = self.new_button_escribir("Á")
++        self.btn_A_tilde.set_text_desc("Á tilde")
++        self.losBotones.append(self.btn_A_tilde)
++        self.fila_4.append(self.btn_A_tilde)
++
++        self.btn_E_tilde = self.new_button_escribir("É")
++        self.btn_E_tilde.set_text_desc("É tilde")
++        self.losBotones.append(self.btn_E_tilde)
++        self.fila_4.append(self.btn_E_tilde)
++
++        self.btn_I_tilde = self.new_button_escribir("Í")
++        self.btn_I_tilde.set_text_desc("Í tilde")
++        self.losBotones.append(self.btn_I_tilde)
++        self.fila_4.append(self.btn_I_tilde)
++
++        self.btn_O_tilde = self.new_button_escribir("Ó")
++        self.btn_O_tilde.set_text_desc("Ó tilde")
++        self.losBotones.append(self.btn_O_tilde)
++        self.fila_4.append(self.btn_O_tilde)
++
++        self.btn_U_tilde = self.new_button_escribir("Ú")
++        self.btn_U_tilde.set_text_desc("Ú tilde")
++        self.losBotones.append(self.btn_U_tilde)
++        self.fila_4.append(self.btn_U_tilde)
++
++        self.btn_opciones = self.new_button(gtk.STOCK_PREFERENCES, " ", self.desplegar_opciones)
++        self.btn_cambiar_tipo = self.new_button_cambiar_tipo("123")
++        self.fila_4.append(self.btn_cambiar_tipo)
++
++        #dibujo tabla
++        table = gtk.Table(7, 13, True)
++
++        table.set_row_spacing(0, 3)
++        table.set_row_spacing(1, 3)
++        table.set_row_spacing(2, 13)
++        table.set_row_spacing(3, 10)
++        table.set_row_spacing(4, 3)
++        table.set_row_spacing(5, 3)
++        table.set_row_spacing(6, 3)
++
++        table.set_col_spacing(0, 3)
++        table.set_col_spacing(1, 3)
++        table.set_col_spacing(2, 3)
++        table.set_col_spacing(3, 3)
++        table.set_col_spacing(4, 3)
++        table.set_col_spacing(5, 3)
++        table.set_col_spacing(6, 3)
++        table.set_col_spacing(7, 3)
++        table.set_col_spacing(8, 3)
++        table.set_col_spacing(9, 3)
++        table.set_col_spacing(10, 3)
++        table.set_col_spacing(11, 13)
++        table.set_col_spacing(12, 3)
++
++
++        table.attach(self.btn_Q, 0, 1, 0, 1)
++        table.attach(self.btn_W, 1, 2, 0, 1)
++        table.attach(self.btn_E, 2, 3, 0, 1)
++        table.attach(self.btn_R, 3, 4, 0, 1)
++        table.attach(self.btn_T, 4, 5, 0, 1)
++        table.attach(self.btn_Y, 5, 6, 0, 1)
++        table.attach(self.btn_U, 6, 7, 0, 1)
++        table.attach(self.btn_I, 7, 8, 0, 1)
++        table.attach(self.btn_O, 8, 9, 0, 1)
++        table.attach(self.btn_P, 9, 10, 0, 1)
++        table.attach(self.btn_A, 0, 1, 1, 2)
++        table.attach(self.btn_S, 1, 2, 1, 2)
++        table.attach(self.btn_D, 2, 3, 1, 2)
++        table.attach(self.btn_F, 3, 4, 1, 2)
++        table.attach(self.btn_G, 4, 5, 1, 2)
++        table.attach(self.btn_H, 5, 6, 1, 2)
++        table.attach(self.btn_J, 6, 7, 1, 2)
++        table.attach(self.btn_K, 7, 8, 1, 2)
++        table.attach(self.btn_L, 8, 9, 1, 2)
++        table.attach(self.btn_Z, 0, 1, 2, 3)
++        table.attach(self.btn_X, 1, 2, 2, 3)
++        table.attach(self.btn_C, 2, 3, 2, 3)
++        table.attach(self.btn_V, 3, 4, 2, 3)
++        table.attach(self.btn_B, 4, 5, 2, 3)
++        table.attach(self.btn_N, 5, 6, 2, 3)
++        table.attach(self.btn_M, 6, 7, 2, 3)
++
++        table.attach(self.btn_BACK_SPACE, 10, 13, 0, 1)
++        table.attach(self.btn_ENTER, 10, 13, 1, 2)
++        table.attach(self.btn_SPACE, 1, 9, 4, 5)
++        table.attach(self.btn_opciones, 12, 13, 4, 5)
++        table.attach(self.btn_cambiar_tipo, 12, 13, 3, 4)
++
++
++        table.attach(self.btn_A_tilde, 1, 2, 3, 4)
++        table.attach(self.btn_E_tilde, 2, 3, 3, 4)
++        table.attach(self.btn_I_tilde, 3, 4, 3, 4)
++        table.attach(self.btn_O_tilde, 4, 5, 3, 4)
++        table.attach(self.btn_U_tilde, 5, 6, 3, 4)
++
++        child.pack_end(table, True, True, 0)
++
++        return child
++
++    def get_size_dialog(self, size, teclado_tipo):
++        if teclado_tipo == "COMPLETO":
++            if size == "CHICO":
++                return 700, 335
++            if size == "MEDIANO":
++                return 1000, 400
++            if size == "GRANDE":
++                return 1200, 475
++
++        if teclado_tipo == "NUMERICO":
++            if size == "CHICO":
++                return 700, 400
++            if size == "MEDIANO":
++                return 900, 400
++            if size == "GRANDE":
++                return 1200, 500
++
++        if teclado_tipo == "LETRAS":
++            if size == "CHICO":
++                return 830, 290
++            if size == "MEDIANO":
++                return 1000, 330
++            if size == "GRANDE":
++                return 1200, 550
++
++    def get_font_desc(self, size, teclado_tipo):
++        if teclado_tipo == "COMPLETO":
++            if size == "CHICO":
++                return "sans 7"
++            if size == "MEDIANO":
++                return "sans bold 13"
++            if size == "GRANDE":
++                return "sans bold 15"
++
++        if teclado_tipo == "NUMERICO":
++            if size == "CHICO":
++                return "sans bold 7"
++            if size == "MEDIANO":
++                return "sans bold 13"
++            if size == "GRANDE":
++                return "sans bold 28"
++
++        if teclado_tipo == "LETRAS":
++            if size == "CHICO":
++                return "sans 7"
++            if size == "MEDIANO":
++                return "sans bold 13"
++            if size == "GRANDE":
++                return "sans bold 26"
++
++    def cambiar_tipo(self, w):
++
++        if (self.teclado_tipo=="NUMERICO"):
++            tipo = "LETRAS"
++        else:
++            tipo = "NUMERICO"
++
++        self.set_tipo_teclado(tipo)
++
++        self.hilo_type = threading.Thread(target = self.reset)
++        self.hilo_type.start()
++        self.hilo_type.quit = True
++
++        self.close()
++
++class Boton(gtk.Button):
++    font_desc = ''
++    font_color = ''
++    fondo_color = ''
++    text = ''
++    text_desc = ''
++
++    def __init__(self, nom=None):
++        gtk.Button.__init__(self)
++
++        self.hbox = gtk.HBox(False, 0)
++        self.add(self.hbox)
++
++        self.label = gtk.Label()
++        self.set_text(nom)
++
++        self.set_text(nom)
++        self.set_text_desc(nom)
++        self.set_font_desc('sans bold 13')
++        self.set_font_color('black')
++        self.set_fondo_color('white')
++
++        self.label.set_use_underline(True)
++        self.hbox.add(self.label)
++
++    def set_font_desc(self, pfont_desc):
++        self.font_desc = pfont_desc
++        self.label.modify_font(pango.FontDescription(pfont_desc))
++
++    def set_font_color(self, pfont_color):
++        self.font_color = pfont_color
++        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(pfont_color))
++
++    def set_fondo_color(self, pfondo_color):
++        self.fondo_color = pfondo_color
++        self.modify_bg( gtk.STATE_NORMAL, gtk.gdk.color_parse(pfondo_color))
++
++    def set_text(self, ptext):
++        if (not ptext == None):
++            self.text = ptext
++        self.label.set_text(self.text)
++
++    def get_font_desc(self):
++        return self.font_desc
++
++    def get_font_color(self):
++        return self.font_color
++
++    def get_fondo_color(self):
++        return self.fondo_color
++
++    def get_text(self):
++        return self.text
++
++    def is_visible(self):
++        self.get_property('visible')
++
++    def get_text_desc(self):
++        return self.text_desc
++
++    def set_text_desc(self, ptext_desc):
++        self.text_desc = ptext_desc
++
++    def set_icon(self, icon):
++        #http://www.pygtk.org/docs/pygtk/gtk-stock-items.html
++        s = gtk.Style()
++        icon = s.lookup_icon_set(icon).render_icon(s, gtk.TEXT_DIR_LTR, gtk.STATE_NORMAL, gtk.ICON_SIZE_BUTTON, self.hbox, None)
++        img = gtk.Image()
++        img.set_from_pixbuf(icon)
++        self.hbox.add(img)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0030-accessibility_0008_cp_show-virtualkeyboard-for-acces.patch b/rpms/sugar/0030-accessibility_0008_cp_show-virtualkeyboard-for-acces.patch
new file mode 100644
index 0000000..a84d066
--- /dev/null
+++ b/rpms/sugar/0030-accessibility_0008_cp_show-virtualkeyboard-for-acces.patch
@@ -0,0 +1,188 @@
+From 8c907b5c0c77b1a9adb69976c44e74a5615d127e Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:24:33 +0100
+Subject: [PATCH sugar 30/74] accessibility_0008_cp_show-virtualkeyboard-for-accessibility.patch
+
+---
+ extensions/cpsection/accessibility/model.py |   13 +++++++++-
+ extensions/cpsection/accessibility/view.py  |   32 ++++++++++++++++++++++++++-
+ extensions/deviceicon/virtualkeyboard.py    |   10 ++++++--
+ extensions/globalkey/virtualkeyboard.py     |   10 ++++++-
+ src/jarabe/model/accessibility.py           |    8 ++++++
+ 5 files changed, 65 insertions(+), 8 deletions(-)
+
+diff --git a/extensions/cpsection/accessibility/model.py b/extensions/cpsection/accessibility/model.py
+index 9afec04..2298ec0 100644
+--- a/extensions/cpsection/accessibility/model.py
++++ b/extensions/cpsection/accessibility/model.py
+@@ -23,7 +23,7 @@
+ screen = accessibility.Screen()
+ mouse = accessibility.Mouse()
+ 
+-KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'contrast', 'white_mouse', 'accel_mouse', 'capital_letters']
++KEYWORDS = ['mouse_keys', 'sticky_keys', 'bounce_keys', 'virtualkeyboard', 'contrast', 'white_mouse', 'accel_mouse', 'capital_letters']
+ 
+ def get_mouse_keys():
+     return keyboard.get_mouse_keys()
+@@ -52,6 +52,15 @@ def set_bounce_keys(activar):
+ def print_bounce_keys():
+     print str(get_bounce_keys())
+ 
++def get_virtualkeyboard():
++    return keyboard.get_virtualkeyboard()
++
++def set_virtualkeyboard(activar):
++    keyboard.set_virtualkeyboard(activar)
++
++def print_virtualkeyboard():
++    print str(get_virtualkeyboard())
++
+ def get_contrast():
+     return screen.get_contrast()
+ 
+@@ -86,4 +95,4 @@ def set_accel_mouse(valor):
+ 	mouse.set_accel_mouse(valor)
+ 
+ def print_accel_mouse():
+-    print str(get_accel_mouse())
+\ No newline at end of file
++    print str(get_accel_mouse())
+diff --git a/extensions/cpsection/accessibility/view.py b/extensions/cpsection/accessibility/view.py
+index f06f7ae..6208466 100644
+--- a/extensions/cpsection/accessibility/view.py
++++ b/extensions/cpsection/accessibility/view.py
+@@ -77,6 +77,7 @@ def _view_keyboard_options(self):
+         self._view_mouse_keys()
+         self._view_sticky_keys()
+         self._view_bounce_keys()
++        self._view_virtualkeyboard()
+ 
+         self._vbox_section.pack_start(self.box_pm_keyboard, expand=False)
+         self.box_pm_keyboard.show()
+@@ -133,6 +134,14 @@ def _set_bounce_keys(self, widget):
+         state = widget.get_active()
+         self._model.set_bounce_keys(state)
+ 
++    def _set_virtualkeyboard(self, widget):
++        state = widget.get_active()
++        self._model.set_virtualkeyboard(state)
++        self.restart_alerts.append('zone')
++        self.needs_restart = True
++        self._zone_alert.props.msg = self.restart_msg
++        self._zone_alert.show()
++
+     def _set_contrast(self, widget):
+         state = widget.get_active()
+         self._model.set_contrast(state)
+@@ -165,6 +174,9 @@ def undo(self):
+         self._model.set_sticky_keys(self.init_state_sticky_keys)
+         self._model.set_bounce_keys(self.init_state_bounce_keys)
+ 
++        self._model.set_virtualkeyboard(self.init_state_virtualkeyboard)
++        self.btn_virtualkeyboard.set_active(self.init_state_virtualkeyboard)
++
+         self._model.set_contrast(self.init_state_contrast)
+         self.btn_contrast.set_active(self.init_state_contrast)
+ 
+@@ -219,6 +231,24 @@ def _view_bounce_keys(self):
+         self.box_pm_keyboard.pack_start(lbl_bounce, True, True, 2)
+         lbl_bounce.show()
+ 
++    def _view_virtualkeyboard(self):
++        self.btn_virtualkeyboard = gtk.CheckButton(_('Virtual keyboard'))
++        self._virtualkeyboard_pm_change_handler = self.btn_virtualkeyboard.connect("toggled", self._set_virtualkeyboard)
++        self.init_state_virtualkeyboard = self._model.get_virtualkeyboard()
++        if self.init_state_virtualkeyboard:
++            self.btn_virtualkeyboard.handler_block(self._virtualkeyboard_pm_change_handler)
++            self.btn_virtualkeyboard.set_active(True)
++            self.btn_virtualkeyboard.handler_unblock(self._virtualkeyboard_pm_change_handler)
++        else:
++            self.btn_virtualkeyboard.set_active(False)
++        self.box_pm_keyboard.pack_start(self.btn_virtualkeyboard, True, True, 2)
++        self.btn_virtualkeyboard.show()
++
++        lbl_virtualkeyboard = gtk.Label(_('Show virtual keyboard on frame.'))
++        lbl_virtualkeyboard.set_alignment(0, 0)
++        self.box_pm_keyboard.pack_start(lbl_virtualkeyboard, True, True, 2)
++        lbl_virtualkeyboard.show()
++
+     def _view_contrast(self):
+         self.btn_contrast = gtk.CheckButton(_('Contrast'))
+         self._contrast_pm_change_handler = self.btn_contrast.connect("toggled", self._set_contrast)
+@@ -298,4 +328,4 @@ def _view_acceleration_mouse(self):
+         desc_accel_mouse.show()
+ 
+     def setup(self):
+-        pass
+\ No newline at end of file
++        pass
+diff --git a/extensions/deviceicon/virtualkeyboard.py b/extensions/deviceicon/virtualkeyboard.py
+index 955f79b..fbd0b35 100644
+--- a/extensions/deviceicon/virtualkeyboard.py
++++ b/extensions/deviceicon/virtualkeyboard.py
+@@ -13,6 +13,7 @@
+ from jarabe.frame.frameinvoker import FrameWidgetInvoker
+ 
+ import jarabe.view.virtualkeyboard
++from jarabe.model import accessibility
+ 
+ class DeviceView(TrayIcon):
+ 
+@@ -66,7 +67,10 @@ def _close_activate_cb(self, gobject_ref):
+         except:
+             pass
+ 
+-
+ def setup(tray):
+-    tray.add_device(DeviceView())
+-
++    try:
++        keyboard = accessibility.Keyboard()
++        if keyboard.get_virtualkeyboard():
++            tray.add_device(DeviceView())
++    except:
++        logging.error('show virtual keyboard device icon')
+diff --git a/extensions/globalkey/virtualkeyboard.py b/extensions/globalkey/virtualkeyboard.py
+index bba0877..8cf4b0b 100644
+--- a/extensions/globalkey/virtualkeyboard.py
++++ b/extensions/globalkey/virtualkeyboard.py
+@@ -1,9 +1,15 @@
+ import logging
+ 
+ import jarabe.view.virtualkeyboard
++from jarabe.model import accessibility
+ 
+ BOUND_KEYS = ['<alt>k']
+ 
+ def handle_key_press(key):
+-    logging.debug('load virtual keyboard')
+-    jarabe.view.virtualkeyboard.Teclado()
++    try:
++        keyboard = accessibility.Keyboard()
++        if keyboard.get_virtualkeyboard():
++            logging.debug('load virtual keyboard')
++            jarabe.view.virtualkeyboard.Teclado()
++    except:
++        logging.error('show virtual keyboard globalkey')
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index 299f8d4..b1b2b8a 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -50,6 +50,14 @@ def set_bounce_keys(self, activar):
+         client.set_bool("/desktop/sugar/accessibility/keyboard/bouncekeys_enable", activar)
+         self.run_config_keyboard()
+ 
++    def get_virtualkeyboard(self):
++        client = gconf.client_get_default()
++        return client.get_bool("/desktop/sugar/accessibility/keyboard/virtualkeyboard_enable")
++
++    def set_virtualkeyboard(self, activar):
++        client = gconf.client_get_default()
++        client.set_bool("/desktop/sugar/accessibility/keyboard/virtualkeyboard_enable", activar)
++
+     def run_config_keyboard(self):
+         cmd = ['ax']
+         if self.get_sticky_keys():
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0031-accessibility_0007_cp_translations.patch.patch b/rpms/sugar/0031-accessibility_0007_cp_translations.patch.patch
new file mode 100644
index 0000000..87b2143
--- /dev/null
+++ b/rpms/sugar/0031-accessibility_0007_cp_translations.patch.patch
@@ -0,0 +1,91 @@
+From ed6349c92c0395921af793d3ae9c60b20d6b63de Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:25:42 +0100
+Subject: [PATCH sugar 31/74] accessibility_0007_cp_translations.patch
+
+---
+ po/es.po |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 68 insertions(+), 0 deletions(-)
+
+diff --git a/po/es.po b/po/es.po
+index 474d28f..ea4579c 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1888,6 +1888,74 @@ msgstr "Respaldar Diario"
+ msgid "School Server"
+ msgstr "Servidor Escuela"
+ 
++#: ../extensions/cpsection/accessibility/__init__.py:24
++msgid "Accessibility"
++msgstr "Accesibilidad"
++
++#: ../extensions/cpsection/accessibility/view.py:77
++msgid "Mouse Keys"
++msgstr "Teclas del ratón"
++
++#: ../extensions/cpsection/accessibility/view.py:84
++msgid "Move the mouse pointer with keyboard number."
++msgstr "Mover el puntero del ratón con un teclado numérico o con las teclas de juego."
++
++#: ../extensions/cpsection/accessibility/view.py:90
++msgid "Sticky Keys"
++msgstr "Teclas pegajosas"
++
++#: ../extensions/cpsection/accessibility/view.py:97
++msgid "Instead of having to press two keys at once (such as CTRL + Q), you can press one key at a time."
++msgstr "En lugar de tener que pulsar dos teclas a la vez (por ejemplo, CTRL + Q), permite pulsar una tecla a la vez."
++
++#: ../extensions/cpsection/accessibility/view.py:104
++msgid "Bounce Keys"
++msgstr "Teclas de rebote"
++
++#: ../extensions/cpsection/accessibility/view.py:111
++msgid "Ignore rapid, repeated keypresses of the same key."
++msgstr "Ignora la presión rápida y repetida de una tecla."
++
++#: ../extensions/cpsection/accessibility/view.py:89
++msgid "Screen"
++msgstr "Pantalla"
++
++#: ../extensions/cpsection/accessibility/view.py:176
++msgid "Contrast"
++msgstr "Contraste"
++
++#: ../extensions/cpsection/accessibility/view.py:188
++msgid "Enables the color contrast of the graphic interface."
++msgstr "Habilita el contraste de colores en la interfaz gráfica."
++
++#: ../extensions/cpsection/accessibility/view.py:108
++msgid "Mouse"
++msgstr "Ratón"
++
++#: ../extensions/cpsection/accessibility/view.py:227
++msgid "White Mouse"
++msgstr "Ratón blanco"
++
++#: ../extensions/cpsection/accessibility/view.py:239
++msgid "Show the mouse cursor white."
++msgstr "Mostrar el puntero del ratón blanco."
++
++#: ../extensions/cpsection/accessibility/view.py:247
++msgid "Acceleration: "
++msgstr "Aceleración: "
++
++#: ../extensions/cpsection/accessibility/view.py:263
++msgid "Controller acceleration mouse."
++msgstr "Controla la aceleración del ratón."
++
++#: ../extensions/cpsection/accessibility/view.py:241
++msgid "Capital letters"
++msgstr "Letras mayúsculas"
++
++#: ../extensions/cpsection/accessibility/view.py:253
++msgid "Shows capital letters in the user interface."
++msgstr "Muestra las letras en mayúsculas en la interfaz gráfica."
++
+ # 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
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0032-accessibility_0009_cp_show-virtualkeyboard-for-acces.patch b/rpms/sugar/0032-accessibility_0009_cp_show-virtualkeyboard-for-acces.patch
new file mode 100644
index 0000000..f6c49cf
--- /dev/null
+++ b/rpms/sugar/0032-accessibility_0009_cp_show-virtualkeyboard-for-acces.patch
@@ -0,0 +1,31 @@
+From 162523de5dc3ad7739f0b5cc8a026cd4b74ab247 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 1 Nov 2010 18:27:08 +0100
+Subject: [PATCH sugar 32/74] accessibility_0009_cp_show-virtualkeyboard-for-accessibility-traslate.patch
+
+---
+ po/es.po |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/po/es.po b/po/es.po
+index ea4579c..241b8b6 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1956,6 +1956,14 @@ msgstr "Letras mayúsculas"
+ msgid "Shows capital letters in the user interface."
+ msgstr "Muestra las letras en mayúsculas en la interfaz gráfica."
+ 
++#: ../extensions/cpsection/accessibility/view.py:235
++msgid "Virtual keyboard"
++msgstr "Teclado virtual"
++
++#: ../extensions/cpsection/accessibility/view.py:247
++msgid "Show virtual keyboard on frame."
++msgstr "Muestra el teclado virtual en el marco."
++
+ # 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
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0033-accessibility_0012_add-accel-mouse-default.patch.patch b/rpms/sugar/0033-accessibility_0012_add-accel-mouse-default.patch.patch
new file mode 100644
index 0000000..b04f955
--- /dev/null
+++ b/rpms/sugar/0033-accessibility_0012_add-accel-mouse-default.patch.patch
@@ -0,0 +1,37 @@
+From b91753755ce6f3fa8867a3ffa47b97ffe5a6ac62 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 18 Jul 2011 20:23:02 +0200
+Subject: [PATCH sugar 33/74] accessibility_0012_add-accel-mouse-default.patch
+
+---
+ src/jarabe/model/accessibility.py |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index b1b2b8a..a5cb7ed 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -114,6 +114,7 @@ class Mouse:
+ 
+     WHITE_CURSOR_THEME="FlatbedCursors.White.Huge"
+     DEFAULT_CURSOR_THEME="sugar"
++    DEFAULT_ACCEL_MOUSE=3
+ 
+     def get_white_mouse(self):
+         client = gconf.client_get_default()
+@@ -156,8 +157,11 @@ class AccessibilityManager:
+     def setup_accessibility(self):
+         client = gconf.client_get_default()
+         is_accessibility = client.dir_exists("/desktop/sugar/accessibility")
++        mouse = Mouse()
+         if is_accessibility:
+             keyboard = Keyboard()
+             keyboard.run_config_keyboard()
+-            mouse = Mouse()
+             mouse.run_config_mouse()
++        else:
++            mouse.set_accel_mouse(mouse.DEFAULT_ACCEL_MOUSE)
++            mouse._set_accel_mouse_setting()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0034-accessibility_0013_add-theme-mouse-default.patch.patch b/rpms/sugar/0034-accessibility_0013_add-theme-mouse-default.patch.patch
new file mode 100644
index 0000000..ccc0bc4
--- /dev/null
+++ b/rpms/sugar/0034-accessibility_0013_add-theme-mouse-default.patch.patch
@@ -0,0 +1,22 @@
+From 99403402adac7cb8247667dc951a66fcef7dddbf Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 18 Jul 2011 20:23:30 +0200
+Subject: [PATCH sugar 34/74] accessibility_0013_add-theme-mouse-default.patch
+
+---
+ src/jarabe/model/accessibility.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/jarabe/model/accessibility.py b/src/jarabe/model/accessibility.py
+index a5cb7ed..4c5e93c 100644
+--- a/src/jarabe/model/accessibility.py
++++ b/src/jarabe/model/accessibility.py
+@@ -164,4 +164,5 @@ def setup_accessibility(self):
+             mouse.run_config_mouse()
+         else:
+             mouse.set_accel_mouse(mouse.DEFAULT_ACCEL_MOUSE)
++            mouse.set_white_mouse(False)
+             mouse._set_accel_mouse_setting()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0035-Share-3g-connection.patch b/rpms/sugar/0035-Share-3g-connection.patch
new file mode 100644
index 0000000..32da69f
--- /dev/null
+++ b/rpms/sugar/0035-Share-3g-connection.patch
@@ -0,0 +1,300 @@
+From c16b121d6ceab84da73d7c4bf1e703b8e45e60c4 Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.org>
+Date: Mon, 1 Nov 2010 14:23:51 -0300
+Subject: [PATCH sugar 35/74] Share 3g connection
+
+dextrose backport
+---
+ extensions/deviceicon/network.py |  179 +++++++++++++++++++++++++++++++++++--
+ 1 files changed, 169 insertions(+), 10 deletions(-)
+
+diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
+index 789ea13..234b06b 100644
+--- a/extensions/deviceicon/network.py
++++ b/extensions/deviceicon/network.py
+@@ -23,6 +23,8 @@
+ import hashlib
+ import socket
+ import struct
++import random
++import re
+ import datetime
+ import time
+ import gtk
+@@ -39,6 +41,7 @@
+ from sugar.graphics.menuitem import MenuItem
+ from sugar.graphics.icon import Icon
+ from sugar.graphics import xocolor
++from sugar.util import unique_id
+ from sugar import profile
+ 
+ from jarabe.model import network
+@@ -58,6 +61,7 @@
+ _NM_OLPC_MESH_IFACE = 'org.freedesktop.NetworkManager.Device.OlpcMesh'
+ _NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
+ _NM_ACTIVE_CONN_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
++_NM_OBJ_PROPERTIES = 'org.freedesktop.DBus.Properties'
+ 
+ _GSM_STATE_NOT_READY = 0
+ _GSM_STATE_DISCONNECTED = 1
+@@ -65,6 +69,12 @@
+ _GSM_STATE_CONNECTED = 3
+ _GSM_STATE_FAILED = 4
+ 
++_GSM_SHARING_PRIVATE = 0
++_GSM_SHARING_TRYING = 1
++_GSM_SHARING_NEIGHBORHOOD = 2
++
++_GSM_SHARING_CHANNELS = [2,3,4,5,7,8,9,10,12,13]
++
+ 
+ class WirelessPalette(Palette):
+     __gtype_name__ = 'SugarWirelessPalette'
+@@ -207,6 +217,9 @@ class GsmPalette(Palette):
+     __gsignals__ = {
+         'gsm-connect': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
+         'gsm-disconnect': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
++        'gsm-private': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
++        'gsm-neighborhood': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
++                             ([]))
+     }
+ 
+     def __init__(self):
+@@ -215,12 +228,17 @@ def __init__(self):
+ 
+         self._current_state = None
+         self._failed_connection = False
++        self._sharing_state = _GSM_SHARING_PRIVATE
+ 
+         self._toggle_state_item = MenuItem('')
+         self._toggle_state_item.connect('activate', self.__toggle_state_cb)
+         self.menu.append(self._toggle_state_item)
+         self._toggle_state_item.show()
+ 
++        self._sharing_toggle_item = MenuItem('')
++        self._sharing_toggle_item.connect('activate', self.__sharing_toggle_cb)
++        self.menu.append(self._sharing_toggle_item)
++
+         self.info_box = gtk.VBox()
+ 
+         self.error_title_label = gtk.Label("")
+@@ -305,6 +323,9 @@ def _update_label_and_text(self, reason=0):
+             icon = Icon(icon_name='media-eject', \
+                             icon_size=gtk.ICON_SIZE_MENU)
+             self._toggle_state_item.set_image(icon)
++            self.sharing_update_text()
++            self._sharing_toggle_item.show()
++            return
+ 
+         elif self._current_state == _GSM_STATE_FAILED:
+             message_error = self._get_error_by_nm_reason(reason)
+@@ -313,6 +334,8 @@ def _update_label_and_text(self, reason=0):
+             raise ValueError('Invalid GSM state while updating label and ' \
+                              'text, %s' % str(self._current_state))
+ 
++        self._sharing_toggle_item.hide()
++
+     def __toggle_state_cb(self, menuitem):
+         if self._current_state == _GSM_STATE_NOT_READY:
+             pass
+@@ -373,6 +396,38 @@ def _get_error_by_nm_reason(self, reason):
+         message_tuple = (network.get_error_by_reason(reason), message)
+         return message_tuple
+ 
++    def sharing_update_text(self):
++        if self._sharing_state == _GSM_SHARING_PRIVATE:
++            self._sharing_toggle_item.get_child().set_label(_('Private'))
++            icon = Icon(icon_name='zoom-home', icon_size=gtk.ICON_SIZE_MENU)
++            self._sharing_toggle_item.set_image(icon)
++
++        elif self._sharing_state == _GSM_SHARING_TRYING:
++            self._sharing_toggle_item.get_child().set_label(_('Please wait...'))
++
++        elif self._sharing_state == _GSM_SHARING_NEIGHBORHOOD:
++            self._sharing_toggle_item.get_child().set_label(_('My Neighborhood'))
++            icon = Icon(icon_name='zoom-neighborhood', icon_size=gtk.ICON_SIZE_MENU)
++            self._sharing_toggle_item.set_image(icon)
++
++        else:
++             raise ValueError('Invalid GSM sharing state while updating, %s' % \
++                             str(self._sharing_state))
++
++    def __sharing_toggle_cb(self, menuitem):
++        if self._sharing_state == _GSM_SHARING_PRIVATE:
++            self.emit('gsm-neighborhood')
++
++        elif self._sharing_state == _GSM_SHARING_TRYING:
++            pass
++
++        elif self._sharing_state == _GSM_SHARING_NEIGHBORHOOD:
++            self.emit('gsm-private')
++
++        else:
++             raise ValueError('Invalid GSM sharing state, %s' % \
++                             str(self._sharing_state))
++
+ 
+ class WirelessDeviceView(ToolButton):
+ 
+@@ -530,8 +585,16 @@ def _update_state(self):
+         else:
+             state = network.DEVICE_STATE_UNKNOWN
+ 
+-        if self._mode != network.NM_802_11_MODE_ADHOC and \
+-                network.is_sugar_adhoc_network(self._name) == False:
++        if self._mode == network.NM_802_11_MODE_ADHOC and \
++                network.is_sugar_adhoc_network(self._name):
++            channel = network.frequency_to_channel(self._frequency)
++            if state == network.DEVICE_STATE_ACTIVATED:
++                self._icon.props.icon_name = 'network-adhoc-%s-connected' \
++                        % channel
++            else:
++                self._icon.props.icon_name = 'network-adhoc-%s' % channel
++            self._icon.props.base_color = profile.get_color()
++        else:
+             if state == network.DEVICE_STATE_ACTIVATED:
+                 icon_name = '%s-connected' % 'network-wireless'
+             else:
+@@ -540,14 +603,6 @@ def _update_state(self):
+             icon_name = get_icon_state(icon_name, self._strength)
+             if icon_name:
+                 self._icon.props.icon_name = icon_name
+-        else:
+-            channel = network.frequency_to_channel(self._frequency)
+-            if state == network.DEVICE_STATE_ACTIVATED:
+-                self._icon.props.icon_name = 'network-adhoc-%s-connected' \
+-                        % channel
+-            else:
+-                self._icon.props.icon_name = 'network-adhoc-%s' % channel
+-            self._icon.props.base_color = profile.get_color()
+ 
+         if state == network.DEVICE_STATE_PREPARE or \
+            state == network.DEVICE_STATE_CONFIG or \
+@@ -728,6 +783,8 @@ class GsmDeviceView(TrayIcon):
+     def __init__(self, device):
+         self._connection_time_handler = None
+         self._connection_timestamp = 0
++        self._shared_connection = None
++        self._target_dev_path = None
+ 
+         client = gconf.client_get_default()
+         color = xocolor.XoColor(client.get_string('/desktop/sugar/user/color'))
+@@ -754,6 +811,8 @@ def create_palette(self):
+         palette.set_group_id('frame')
+         palette.connect('gsm-connect', self.__gsm_connect_cb)
+         palette.connect('gsm-disconnect', self.__gsm_disconnect_cb)
++        palette.connect('gsm-neighborhood', self.__gsm_start_sharing_cb)
++        palette.connect('gsm-private', self.__gsm_stop_sharing_cb)
+ 
+         self._palette = palette
+ 
+@@ -879,6 +938,106 @@ def __connection_timecount_cb(self):
+         self._palette.update_connection_time(connection_time)
+         return True
+ 
++    def __gsm_start_sharing_cb(self, palette):
++        if self._palette._sharing_state == _GSM_SHARING_PRIVATE:
++            logging.debug('GSM will start sharing now')
++            self._palette._sharing_state = _GSM_SHARING_TRYING
++            self._palette.sharing_update_text()
++
++            nm_obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
++            nm_iface = dbus.Interface(nm_obj, _NM_IFACE)
++            devs_paths = nm_iface.GetDevices()
++
++            target_dev_path = None
++            for dev_path in devs_paths:
++                dev_obj = self._bus.get_object(_NM_SERVICE, dev_path)
++                dev_props = dbus.Interface(dev_obj, _NM_OBJ_PROPERTIES)
++                device_type = dev_props.Get(_NM_DEVICE_IFACE, 'DeviceType')
++                if device_type == network.DEVICE_TYPE_802_11_WIRELESS:
++                    target_dev_path = dev_path
++                    break
++
++            if target_dev_path == None:
++                self._gsm_sharing_reset()
++                raise RuntimeError('No device for sharing')
++            self._target_dev_path = target_dev_path
++
++            client = gconf.client_get_default()
++            nick = client.get_string('/desktop/sugar/user/nick')
++            nick = re.sub('\W', '', nick)
++
++            name_format = '%s network'
++            format_length = len(name_format) - len('%s')
++            nick_length = 31 - format_length
++            name = name_format % nick[:nick_length]
++
++            connection = network.find_connection_by_ssid(name)
++            if connection == None:
++                settings = network.Settings()
++                settings.connection.id = name
++                settings.connection.uuid = unique_id()
++                settings.connection.type = '802-11-wireless'
++                settings.wireless.ssid = dbus.ByteArray(name)
++                settings.wireless.mode = 'adhoc'
++                settings.wireless.band = 'bg'
++                chosen_channel = random.randrange(len(_GSM_SHARING_CHANNELS))
++                settings.wireless.channel = _GSM_SHARING_CHANNELS[chosen_channel]
++                settings.ip4_config = network.IP4Config()
++                settings.ip4_config.method = 'shared'
++                connection = network.add_connection(name, settings)
++
++            nm_iface.ActivateConnection(network.SETTINGS_SERVICE,
++                          connection.path,
++                          target_dev_path,
++                          '/',
++                          reply_handler=self.__gsm_sharing_ok_cb,
++                          error_handler=self.__gsm_sharing_error_cb)
++
++    def __gsm_sharing_ok_cb(self, connection):
++        logging.debug('GSM sharing is enabled')
++        self._shared_connection = connection
++        self._bus.add_signal_receiver(self.__gsm_sharing_changed_cb,
++                                      signal_name='StateChanged',
++                                      path=self._target_dev_path,
++                                      dbus_interface=_NM_DEVICE_IFACE)
++        self._palette._sharing_state = _GSM_SHARING_NEIGHBORHOOD
++        self._palette.sharing_update_text()
++
++    def __gsm_sharing_changed_cb(self, new_state, old_state, reason):
++        if new_state == network.DEVICE_STATE_DISCONNECTED:
++            self._gsm_sharing_reset()
++
++    def _gsm_sharing_reset(self):
++            logging.debug('GSM sharing is disabled')
++            if self._target_dev_path != None:
++                self._bus.remove_signal_receiver(self.__gsm_sharing_changed_cb,
++                                                         signal_name='StateChanged',
++                                                         path=self._target_dev_path,
++                                                         dbus_interface=_NM_DEVICE_IFACE)
++            self._shared_connection = None
++            self._target_dev_path = None
++            self._palette._sharing_state = _GSM_SHARING_PRIVATE
++            self._palette.sharing_update_text()
++
++    def __gsm_sharing_error_cb(self, error):
++        logging.debug('GSM sharing could not start: %s' % str(error))
++        self._gsm_sharing_reset()
++
++    def __gsm_stop_sharing_cb(self, palette):
++        logging.debug('GSM will stop sharing now')
++        nm_obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
++        nm_iface = dbus.Interface(nm_obj, _NM_IFACE)
++        nm_iface.DeactivateConnection(
++                self._shared_connection,
++                reply_handler=self.__gsm_stop_sharing_ok_cb,
++                error_handler=self.__gsm_stop_sharing_error_cb)
++
++    def __gsm_stop_sharing_ok_cb(self):
++        self._gsm_sharing_reset()
++
++    def __gsm_stop_sharing_error_cb(self):
++        logging.debug('GSM sharing could not stop')
++
+ 
+ class WirelessDeviceObserver(object):
+     def __init__(self, device, tray):
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0036-Make-sure-Adhoc-is-Sugar-Adhoc.patch b/rpms/sugar/0036-Make-sure-Adhoc-is-Sugar-Adhoc.patch
new file mode 100644
index 0000000..300aa4d
--- /dev/null
+++ b/rpms/sugar/0036-Make-sure-Adhoc-is-Sugar-Adhoc.patch
@@ -0,0 +1,28 @@
+From 24f5ac148b8b3420432ed7d7efbf40971afcdd20 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown@unknown.org>
+Date: Mon, 17 Jan 2011 12:42:33 +0100
+Subject: [PATCH sugar 36/74] Make sure Adhoc is Sugar-Adhoc
+
+---
+ src/jarabe/desktop/networkviews.py |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py
+index 677452d..2fb8593 100644
+--- a/src/jarabe/desktop/networkviews.py
++++ b/src/jarabe/desktop/networkviews.py
+@@ -360,8 +360,9 @@ def _connect(self):
+             elif self._mode == network.NM_802_11_MODE_ADHOC:
+                 settings.wireless.mode = 'adhoc'
+                 settings.wireless.band = 'bg'
+-                settings.ip4_config = IP4Config()
+-                settings.ip4_config.method = 'link-local'
++                if network.is_sugar_adhoc_network(self._name):
++                    settings.ip4_config = IP4Config()
++                    settings.ip4_config.method = 'link-local'
+ 
+             wireless_security = self._get_security()
+             settings.wireless_security = wireless_security
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0037-Simple-messages-notification-extension.patch b/rpms/sugar/0037-Simple-messages-notification-extension.patch
new file mode 100644
index 0000000..2d69945
--- /dev/null
+++ b/rpms/sugar/0037-Simple-messages-notification-extension.patch
@@ -0,0 +1,582 @@
+From 733b96d67567be12e611bf711614e78ffddb66dc Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Wed, 1 Dec 2010 10:27:44 -0300
+Subject: [PATCH sugar 37/74] Simple messages notification extension
+
+Extend jarabe.frame.notification with new graphical
+elements in order to display message notifications.
+These graphical elements were inspired from Gary
+Martin mockups.
+
+Messages notification are accessible through dbus
+see http://library.gnome.org/devel/notification-spec/
+or jarabe.frame.frame.add_message method.
+This implementation only supports icons, summary
+and markup body.
+
+When a message is received:
+
+1. A notification icon will appear and remain
+   as long as the time defined by the caller.
+
+2. A new tray button will be added to the respective
+   tray, this button will remain present until the
+   user reads its content to delete it explicitly.
+
+3. The button constains a message palette that will
+   behave as a messages queue.
+
+Icons-only notications will be accesible and will behave
+as before.
+
+VERSION 2: The messages queue was moved from the corners
+           to the respective trays, in order to mantain
+           the corners available for other usage.
+---
+ src/jarabe/frame/frame.py        |  128 ++++++++++++++++++++----
+ src/jarabe/frame/notification.py |  205 ++++++++++++++++++++++++++++++++++---
+ src/jarabe/view/pulsingicon.py   |   24 +++++
+ 3 files changed, 322 insertions(+), 35 deletions(-)
+
+diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
+index 079eeeb..96e848b 100644
+--- a/src/jarabe/frame/frame.py
++++ b/src/jarabe/frame/frame.py
+@@ -19,6 +19,7 @@
+ import gtk
+ import gobject
+ import hippo
++import os
+ 
+ from sugar.graphics import animator
+ from sugar.graphics import style
+@@ -33,6 +34,7 @@
+ from jarabe.frame.framewindow import FrameWindow
+ from jarabe.frame.clipboardpanelwindow import ClipboardPanelWindow
+ from jarabe.frame.notification import NotificationIcon, NotificationWindow
++from jarabe.frame.notification import NotificationButton, HistoryPalette
+ from jarabe.model import notifications
+ 
+ 
+@@ -44,6 +46,8 @@
+ _FRAME_HIDING_DELAY = 500
+ _NOTIFICATION_DURATION = 5000
+ 
++_DEFAULT_ICON = 'emblem-notification'
++
+ 
+ class _Animation(animator.Animation):
+     def __init__(self, frame, end):
+@@ -119,6 +123,10 @@ def __init__(self):
+         self._event_area.connect('enter', self._enter_corner_cb)
+         self._event_area.show()
+ 
++        self._activities_tray = None
++        self._devices_tray = None
++        self._friends_tray = None
++
+         self._top_panel = self._create_top_panel()
+         self._bottom_panel = self._create_bottom_panel()
+         self._left_panel = self._create_left_panel()
+@@ -131,6 +139,7 @@ def __init__(self):
+         self._mouse_listener = _MouseListener(self)
+ 
+         self._notif_by_icon = {}
++        self._notif_by_message = {}
+ 
+         notification_service = notifications.get_service()
+         notification_service.notification_received.connect(
+@@ -190,6 +199,7 @@ def _create_top_panel(self):
+         panel.append(hippo.CanvasWidget(widget=activities_tray),
+                 hippo.PACK_EXPAND)
+         activities_tray.show()
++        self._activities_tray = activities_tray
+ 
+         return panel
+ 
+@@ -201,6 +211,7 @@ def _create_bottom_panel(self):
+         panel.append(hippo.CanvasWidget(widget=devices_tray),
+                      hippo.PACK_EXPAND)
+         devices_tray.show()
++        self._devices_tray = devices_tray
+ 
+         return panel
+ 
+@@ -210,6 +221,7 @@ def _create_right_panel(self):
+         tray = FriendsTray()
+         panel.append(hippo.CanvasWidget(widget=tray), hippo.PACK_EXPAND)
+         tray.show()
++        self._friends_tray = tray
+ 
+         return panel
+ 
+@@ -285,15 +297,7 @@ def _drag_leave_cb(self, window, drag_context, timestamp):
+     def _enter_corner_cb(self, event_area):
+         self._mouse_listener.mouse_enter()
+ 
+-    def notify_key_press(self):
+-        self._key_listener.key_press()
+-
+-    def add_notification(self, icon, corner=gtk.CORNER_TOP_LEFT,
+-                         duration=_NOTIFICATION_DURATION):
+-
+-        if not isinstance(icon, NotificationIcon):
+-            raise TypeError('icon must be a NotificationIcon.')
+-
++    def _create_notification_window(self, corner):
+         window = NotificationWindow()
+ 
+         screen = gtk.gdk.screen_get_default()
+@@ -309,6 +313,46 @@ def add_notification(self, icon, corner=gtk.CORNER_TOP_LEFT,
+         else:
+             raise ValueError('Inalid corner: %r' % corner)
+ 
++        return window
++
++    def _add_message_button(self, button, corner):
++        if corner == gtk.CORNER_BOTTOM_RIGHT:
++            self._devices_tray.add_item(button)
++        elif corner == gtk.CORNER_TOP_RIGHT:
++            self._friends_tray.add_item(button)
++        else:
++            self._activities_tray.add_item(button)
++
++    def _remove_message_button(self, button, corner):
++        if corner == gtk.CORNER_BOTTOM_RIGHT:
++            self._devices_tray.remove_item(button)
++        elif corner == gtk.CORNER_TOP_RIGHT:
++            self._friends_tray.remove_item(button)
++        else:
++            self._activities_tray.remove_item(button)
++
++    def _launch_notification_icon(self, icon_name, xo_color,
++                                  position, duration):
++        icon = NotificationIcon()
++        icon.props.xo_color = xo_color
++
++        if icon_name.startswith(os.sep):
++            icon.props.icon_filename = icon_name
++        else:
++            icon.props.icon_name = icon_name
++
++        self.add_notification(icon, position, duration)
++
++    def notify_key_press(self):
++        self._key_listener.key_press()
++
++    def add_notification(self, icon, corner=gtk.CORNER_TOP_LEFT,
++                         duration=_NOTIFICATION_DURATION):
++
++        if not isinstance(icon, NotificationIcon):
++            raise TypeError('icon must be a NotificationIcon.')
++
++        window = self._create_notification_window(corner)
+         window.add(icon)
+         icon.show()
+         window.show()
+@@ -327,28 +371,76 @@ def remove_notification(self, icon):
+         window.destroy()
+         del self._notif_by_icon[icon]
+ 
++    def add_message(self, body, summary='', icon_name=_DEFAULT_ICON,
++                    xo_color=None, corner=gtk.CORNER_TOP_LEFT,
++                    duration=_NOTIFICATION_DURATION):
++
++        if xo_color is None:
++            xo_color = profile.get_color()
++
++        button = self._notif_by_message.get(corner, None)
++        if button is None:
++            button = NotificationButton(xo_color)
++            button.show()
++            self._add_message_button(button, corner)
++            self._notif_by_message[corner] = button
++
++        button.start_pulsing()
++
++        palette = button.get_palette()
++        if palette is None:
++            palette = HistoryPalette()
++            palette.set_group_id('frame')
++            palette.connect('clear-messages', self.remove_message, corner)
++            button.set_palette(palette)
++
++        palette.push_message(body, summary, icon_name, xo_color)
++        self._launch_notification_icon(icon_name, xo_color, corner, duration)
++
++
++    def remove_message(self, palette, corner):
++        if corner not in self._notif_by_message:
++            logging.debug('Button %s is not active', str(corner))
++            return
++
++        button = self._notif_by_message[corner]
++        self._remove_message_button(button, corner)
++        del self._notif_by_message[corner]
++
+     def __notification_received_cb(self, **kwargs):
+-        logging.debug('__notification_received_cb')
+-        icon = NotificationIcon()
++        logging.debug('__notification_received_cb %r', kwargs)
+ 
+         hints = kwargs['hints']
+ 
+-        icon_file_name = hints.get('x-sugar-icon-file-name', '')
+-        if icon_file_name:
+-            icon.props.icon_filename = icon_file_name
+-        else:
+-            icon.props.icon_name = 'application-octet-stream'
++        icon_name = hints.get('x-sugar-icon-file-name', '')
++        if not icon_name:
++            icon_name = _DEFAULT_ICON
+ 
+         icon_colors = hints.get('x-sugar-icon-colors', '')
+         if not icon_colors:
+             icon_colors = profile.get_color()
+-        icon.props.xo_color = icon_colors
+ 
+         duration = kwargs.get('expire_timeout', -1)
+         if duration == -1:
+             duration = _NOTIFICATION_DURATION
+ 
+-        self.add_notification(icon, gtk.CORNER_TOP_RIGHT, duration)
++        category = hints.get('category', '')
++        if category == 'device':
++            position = gtk.CORNER_BOTTOM_RIGHT
++        elif category == 'presence':
++            position = gtk.CORNER_TOP_RIGHT
++        else:
++            position = gtk.CORNER_TOP_LEFT
++
++        summary = kwargs.get('summary', '')
++        body = kwargs.get('body', '')
++
++        if summary or body:
++            self.add_message(body, summary, icon_name,
++                            icon_colors, position, duration)
++        else:
++            self._launch_notification_icon(icon_name, icon_colors,
++                                          position, duration)
+ 
+     def __notification_cancelled_cb(self, **kwargs):
+         # Do nothing for now. Our notification UI is so simple, there's no
+diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py
+index 3471e2c..b5724d5 100644
+--- a/src/jarabe/frame/notification.py
++++ b/src/jarabe/frame/notification.py
+@@ -1,4 +1,6 @@
+ # Copyright (C) 2008 One Laptop Per Child
++# Copyright (C) 2010 Martin Abente
++# Copyright (C) 2010 Aleksey Lim
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -16,13 +18,185 @@
+ 
+ import gobject
+ import gtk
++import re
++import os
++
++from gettext import gettext as _
+ 
+ from sugar.graphics import style
+ from sugar.graphics.xocolor import XoColor
++from sugar.graphics.palette import Palette
++from sugar.graphics.menuitem import MenuItem
++from sugar.graphics.toolbutton import ToolButton
++from sugar import profile
+ 
++from jarabe.frame.frameinvoker import FrameWidgetInvoker
+ from jarabe.view.pulsingicon import PulsingIcon
+ 
+ 
++_PULSE_TIMEOUT = 3
++_PULSE_COLOR = XoColor('%s,%s' % \
++        (style.COLOR_BUTTON_GREY.get_svg(), style.COLOR_TRANSPARENT.get_svg()))
++_BODY_FILTERS = "<img.*?/>"
++_NOTIFICATION_ICON = 'emblem-notification'
++
++
++def _create_pulsing_icon(icon_name, xo_color):
++    icon = PulsingIcon(
++            pixel_size=style.STANDARD_ICON_SIZE,
++            pulse_color=_PULSE_COLOR,
++            base_color=xo_color,
++            timeout=_PULSE_TIMEOUT,
++            )
++
++    if icon_name.startswith(os.sep):
++        icon.props.file = icon_name
++    else:
++        icon.props.icon_name = icon_name
++
++    return icon
++
++
++class _HistoryIconWidget(gtk.Alignment):
++    __gtype_name__ = 'SugarHistoryIconWidget'
++
++    def __init__(self, icon_name, xo_color):
++        icon = _create_pulsing_icon(icon_name, xo_color)
++        icon.props.pulsing = True
++
++        gtk.Alignment.__init__(self, xalign=0.5, yalign=0.0)
++        self.props.top_padding = style.DEFAULT_PADDING
++        self.set_size_request(
++                style.GRID_CELL_SIZE - style.FOCUS_LINE_WIDTH * 2,
++                style.GRID_CELL_SIZE - style.DEFAULT_PADDING)
++        self.add(icon)
++
++
++class _HistorySummaryWidget(gtk.Alignment):
++    __gtype_name__ = 'SugarHistorySummaryWidget'
++
++    def __init__(self, summary):
++        summary_label = gtk.Label()
++        summary_label.props.wrap = True
++        summary_label.set_markup(
++                '<b>%s</b>' % gobject.markup_escape_text(summary))
++
++        gtk.Alignment.__init__(self, xalign=0.0, yalign=1.0)
++        self.props.right_padding = style.DEFAULT_SPACING
++        self.add(summary_label)
++
++
++class _HistoryBodyWidget(gtk.Alignment):
++    __gtype_name__ = 'SugarHistoryBodyWidget'
++
++    def __init__(self, body):
++        body_label = gtk.Label()
++        body_label.props.wrap = True
++        body_label.set_markup(body)
++
++        gtk.Alignment.__init__(self, xalign=0, yalign=0.0)
++        self.props.right_padding = style.DEFAULT_SPACING
++        self.add(body_label)
++
++
++class _MessagesHistoryBox(gtk.VBox):
++    __gtype_name__ = 'SugarMessagesHistoryBox'
++
++    def __init__(self):
++        gtk.VBox.__init__(self)
++        self._setup_links_style()
++
++    def _setup_links_style(self):
++        # XXX: find a better way to change style for upstream
++        link_color = profile.get_color().get_fill_color()
++        visited_link_color = profile.get_color().get_stroke_color()
++
++        links_style='''
++        style "label" {
++          GtkLabel::link-color="%s"
++          GtkLabel::visited-link-color="%s"
++        }
++        widget_class "*GtkLabel" style "label"
++        ''' % (link_color, visited_link_color)
++        gtk.rc_parse_string(links_style)
++
++    def push_message(self, body, summary, icon_name, xo_color):
++        entry = gtk.HBox()
++
++        icon_widget = _HistoryIconWidget(icon_name, xo_color)
++        entry.pack_start(icon_widget, False)
++
++        message = gtk.VBox()
++        message.props.border_width = style.DEFAULT_PADDING
++        entry.pack_start(message)
++
++        if summary:
++            summary_widget = _HistorySummaryWidget(summary)
++            message.pack_start(summary_widget, False)
++
++        body = re.sub(_BODY_FILTERS, '', body)
++
++        if body:
++            body_widget = _HistoryBodyWidget(body)
++            message.pack_start(body_widget)
++
++        entry.show_all()
++        self.pack_start(entry)
++        self.reorder_child(entry, 0)
++
++        self_width_, self_height = self.size_request()
++        if (self_height > gtk.gdk.screen_height() / 4 * 3) and \
++                (len(self.get_children()) > 1):
++            self.remove(self.get_children()[-1])
++
++
++class HistoryPalette(Palette):
++    __gtype_name__ = 'SugarHistoryPalette'
++
++    __gsignals__ = {
++        'clear-messages': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([]))
++    }
++
++    def __init__(self):
++        Palette.__init__(self)
++
++        self.set_accept_focus(False)
++
++        self._messages_box = _MessagesHistoryBox()
++        self._messages_box.show()
++
++        palette_box = self.get_children()[0]
++        primary_box = palette_box.get_children()[0]
++        primary_box.hide()
++        palette_box.add(self._messages_box)
++        palette_box.reorder_child(self._messages_box, 0)
++
++        clear_option = MenuItem(_('Clear history'), 'dialog-cancel')
++        clear_option.connect('activate', self.__clear_messages_cb)
++        clear_option.show()
++
++        self.menu.append(clear_option)
++
++    def __clear_messages_cb(self, clear_option):
++        self.emit('clear-messages')
++
++    def push_message(self, body, summary, icon_name, xo_color):
++        self._messages_box.push_message(body, summary, icon_name, xo_color)
++
++
++class NotificationButton(ToolButton):
++
++    def __init__(self, xo_color):
++        ToolButton.__init__(self)
++        self._icon = _create_pulsing_icon(_NOTIFICATION_ICON, xo_color)
++        self.set_icon_widget(self._icon)
++        self._icon.show()
++        self.set_palette_invoker(FrameWidgetInvoker(self))
++
++    def start_pulsing(self):
++        self._icon.props.pulsing = True
++
++
+ class NotificationIcon(gtk.EventBox):
+     __gtype_name__ = 'SugarNotificationIcon'
+ 
+@@ -32,28 +206,29 @@ class NotificationIcon(gtk.EventBox):
+         'icon-filename': (str, None, None, None, gobject.PARAM_READWRITE),
+     }
+ 
+-    _PULSE_TIMEOUT = 3
+-
+     def __init__(self, **kwargs):
+         self._icon = PulsingIcon(pixel_size=style.STANDARD_ICON_SIZE)
+         gobject.GObject.__init__(self, **kwargs)
+         self.props.visible_window = False
++        self.set_app_paintable(True)
+ 
+-        self._icon.props.pulse_color = \
+-                XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
+-                                   style.COLOR_TRANSPARENT.get_svg()))
+-        self._icon.props.pulsing = True
++        color = gtk.gdk.color_parse(style.COLOR_BLACK.get_html())
++        self.modify_bg(gtk.STATE_PRELIGHT, color)
++
++        color = gtk.gdk.color_parse(style.COLOR_BUTTON_GREY.get_html())
++        self.modify_bg(gtk.STATE_ACTIVE, color)
++
++        self._icon.props.pulse_color = _PULSE_COLOR
++        self._icon.props.timeout = _PULSE_TIMEOUT
+         self.add(self._icon)
+         self._icon.show()
+ 
+-        gobject.timeout_add_seconds(self._PULSE_TIMEOUT,
+-                                    self.__stop_pulsing_cb)
++        self.start_pulsing()
+ 
+         self.set_size_request(style.GRID_CELL_SIZE, style.GRID_CELL_SIZE)
+ 
+-    def __stop_pulsing_cb(self):
+-        self._icon.props.pulsing = False
+-        return False
++    def start_pulsing(self):
++        self._icon.props.pulsing = True
+ 
+     def do_set_property(self, pspec, value):
+         if pspec.name == 'xo-color':
+@@ -86,17 +261,13 @@ def _get_palette(self):
+ class NotificationWindow(gtk.Window):
+     __gtype_name__ = 'SugarNotificationWindow'
+ 
+-    def __init__(self, **kwargs):
+-
+-        gtk.Window.__init__(self, **kwargs)
++    def __init__(self):
++        gtk.Window.__init__(self, gtk.WINDOW_POPUP)
+ 
+         self.set_decorated(False)
+         self.set_resizable(False)
+         self.connect('realize', self._realize_cb)
+ 
+     def _realize_cb(self, widget):
+-        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+-        self.window.set_accept_focus(False)
+-
+         color = gtk.gdk.color_parse(style.COLOR_TOOLBAR_GREY.get_html())
+         self.modify_bg(gtk.STATE_NORMAL, color)
+diff --git a/src/jarabe/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py
+index 9a98a80..0a97377 100644
+--- a/src/jarabe/view/pulsingicon.py
++++ b/src/jarabe/view/pulsingicon.py
+@@ -88,12 +88,23 @@ def __init__(self, **kwargs):
+         self._pulse_color = None
+         self._paused = False
+         self._pulsing = False
++        self._timeout = 0
++        self._pulsing_sid = None
+ 
+         Icon.__init__(self, **kwargs)
+ 
+         self._palette = None
+         self.connect('destroy', self.__destroy_cb)
+ 
++    def set_timeout(self, timeout):
++        self._timeout = timeout
++
++    def get_timeout(self):
++        return self._timeout
++
++    timeout = gobject.property(
++        type=int, getter=get_timeout, setter=set_timeout)
++
+     def set_pulse_color(self, pulse_color):
+         self._pulse_color = pulse_color
+         self._pulser.update()
+@@ -140,10 +151,20 @@ def get_paused(self):
+         type=bool, default=False, getter=get_paused, setter=set_paused)
+ 
+     def set_pulsing(self, pulsing):
++        if self._pulsing == pulsing:
++            return
++
++        if self._pulsing_sid is not None:
++            gobject.source_remove(self._pulsing_sid)
++            self._pulsing_sid = None
++
+         self._pulsing = pulsing
+ 
+         if self._pulsing:
+             self._pulser.start(restart=True)
++            if self.props.timeout > 0:
++                self._pulsing_sid = gobject.timeout_add_seconds(
++                        self.props.timeout, self.__timeout_cb)
+         else:
+             self._pulser.stop()
+ 
+@@ -163,6 +184,9 @@ def _set_palette(self, palette):
+ 
+     palette = property(_get_palette, _set_palette)
+ 
++    def __timeout_cb(self):
++        self.props.pulsing = False
++
+     def __destroy_cb(self, icon):
+         self._pulser.stop()
+         if self._palette is not None:
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0038-Improve-message-notification-behaviour.patch b/rpms/sugar/0038-Improve-message-notification-behaviour.patch
new file mode 100644
index 0000000..b8ae4f3
--- /dev/null
+++ b/rpms/sugar/0038-Improve-message-notification-behaviour.patch
@@ -0,0 +1,132 @@
+From 2a7d9d90e963e4f7ba4ae28c8fac47176ff94efd Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Mon, 20 Dec 2010 14:27:32 -0300
+Subject: [PATCH sugar 38/74] Improve message notification behaviour
+
+Corner's notification icon will use the same icon
+as the frame notification button.
+
+Frame's notification button will pulse until
+the messages are read.
+---
+ src/jarabe/frame/frame.py        |    9 +++++----
+ src/jarabe/frame/notification.py |   26 ++++++++++++++++++--------
+ 2 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
+index 96e848b..6a9735b 100644
+--- a/src/jarabe/frame/frame.py
++++ b/src/jarabe/frame/frame.py
+@@ -380,22 +380,23 @@ def add_message(self, body, summary='', icon_name=_DEFAULT_ICON,
+ 
+         button = self._notif_by_message.get(corner, None)
+         if button is None:
+-            button = NotificationButton(xo_color)
++            button = NotificationButton(_DEFAULT_ICON, xo_color)
+             button.show()
+             self._add_message_button(button, corner)
+             self._notif_by_message[corner] = button
+ 
+-        button.start_pulsing()
+-
+         palette = button.get_palette()
+         if palette is None:
+             palette = HistoryPalette()
+             palette.set_group_id('frame')
+             palette.connect('clear-messages', self.remove_message, corner)
++            palette.connect('notice-messages', button.stop_pulsing)
+             button.set_palette(palette)
+ 
++        button.start_pulsing()
++
+         palette.push_message(body, summary, icon_name, xo_color)
+-        self._launch_notification_icon(icon_name, xo_color, corner, duration)
++        self._launch_notification_icon(_DEFAULT_ICON, xo_color, corner, duration)
+ 
+ 
+     def remove_message(self, palette, corner):
+diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py
+index b5724d5..99030e5 100644
+--- a/src/jarabe/frame/notification.py
++++ b/src/jarabe/frame/notification.py
+@@ -38,17 +38,18 @@
+ _PULSE_COLOR = XoColor('%s,%s' % \
+         (style.COLOR_BUTTON_GREY.get_svg(), style.COLOR_TRANSPARENT.get_svg()))
+ _BODY_FILTERS = "<img.*?/>"
+-_NOTIFICATION_ICON = 'emblem-notification'
+ 
+ 
+-def _create_pulsing_icon(icon_name, xo_color):
++def _create_pulsing_icon(icon_name, xo_color, timeout=None):
+     icon = PulsingIcon(
+             pixel_size=style.STANDARD_ICON_SIZE,
+             pulse_color=_PULSE_COLOR,
+-            base_color=xo_color,
+-            timeout=_PULSE_TIMEOUT,
++            base_color=xo_color
+             )
+ 
++    if timeout is not None:
++        icon.timeout = timeout
++
+     if icon_name.startswith(os.sep):
+         icon.props.file = icon_name
+     else:
+@@ -61,7 +62,7 @@ class _HistoryIconWidget(gtk.Alignment):
+     __gtype_name__ = 'SugarHistoryIconWidget'
+ 
+     def __init__(self, icon_name, xo_color):
+-        icon = _create_pulsing_icon(icon_name, xo_color)
++        icon = _create_pulsing_icon(icon_name, xo_color, _PULSE_TIMEOUT)
+         icon.props.pulsing = True
+ 
+         gtk.Alignment.__init__(self, xalign=0.5, yalign=0.0)
+@@ -154,7 +155,8 @@ class HistoryPalette(Palette):
+     __gtype_name__ = 'SugarHistoryPalette'
+ 
+     __gsignals__ = {
+-        'clear-messages': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([]))
++        'clear-messages': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
++        'notice-messages': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([]))
+     }
+ 
+     def __init__(self):
+@@ -177,18 +179,23 @@ def __init__(self):
+ 
+         self.menu.append(clear_option)
+ 
++        self.connect('popup', self.__notice_messages_cb)
++
+     def __clear_messages_cb(self, clear_option):
+         self.emit('clear-messages')
+ 
++    def __notice_messages_cb(self, palette):
++        self.emit('notice-messages')
++
+     def push_message(self, body, summary, icon_name, xo_color):
+         self._messages_box.push_message(body, summary, icon_name, xo_color)
+ 
+ 
+ class NotificationButton(ToolButton):
+ 
+-    def __init__(self, xo_color):
++    def __init__(self, icon_name, xo_color):
+         ToolButton.__init__(self)
+-        self._icon = _create_pulsing_icon(_NOTIFICATION_ICON, xo_color)
++        self._icon = _create_pulsing_icon(icon_name, xo_color)
+         self.set_icon_widget(self._icon)
+         self._icon.show()
+         self.set_palette_invoker(FrameWidgetInvoker(self))
+@@ -196,6 +203,9 @@ def __init__(self, xo_color):
+     def start_pulsing(self):
+         self._icon.props.pulsing = True
+ 
++    def stop_pulsing(self, widget):
++        self._icon.props.pulsing = False
++
+ 
+ class NotificationIcon(gtk.EventBox):
+     __gtype_name__ = 'SugarNotificationIcon'
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0039-S-non-intrusive-NamingAlert.patch b/rpms/sugar/0039-S-non-intrusive-NamingAlert.patch
new file mode 100644
index 0000000..cc89ec3
--- /dev/null
+++ b/rpms/sugar/0039-S-non-intrusive-NamingAlert.patch
@@ -0,0 +1,36 @@
+From ff6faeea7c871cd71e7daf9ea4a2f35abddcf514 Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.org>
+Date: Tue, 2 Nov 2010 18:54:16 -0300
+Subject: [PATCH sugar 39/74] S non-intrusive NamingAlert
+
+Add a new gconf value to the scheme to determine when
+or not to show NamingAlert when an activities close.
+---
+ data/sugar.schemas.in |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index c9bc7fe..ba404ec 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -379,5 +379,17 @@
+       </locale>
+     </schema>
+ 
++    <schema>
++      <key>/schemas/desktop/sugar/show_naming_alert</key>
++      <applyto>/desktop/sugar/show_naming_alert</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Show NamingAlert</short>
++        <long>If TRUE, NamingAlert will popup when
++        the activity closes.</long>
++      </locale>
++    </schema>
+   </schemalist>
+ </gconfschemafile>
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0040-Globalkey-for-touchpad-device-icon.patch b/rpms/sugar/0040-Globalkey-for-touchpad-device-icon.patch
new file mode 100644
index 0000000..9b595ac
--- /dev/null
+++ b/rpms/sugar/0040-Globalkey-for-touchpad-device-icon.patch
@@ -0,0 +1,120 @@
+From 2d77d002d70ce8a4f7cd53567592e538654a7ac7 Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Wed, 3 Nov 2010 18:27:30 -0300
+Subject: [PATCH sugar 40/74] Globalkey for touchpad device icon
+
+Add a new keyboard shortcut as a globalkey, this will
+toggle the touchpad mode when <Alt + m> is pressed.
+
+Also change DeviceView.palette indentifier for
+DeviceView._palette. Palette was not showing
+because of that.
+
+Dextrose version
+---
+ extensions/deviceicon/touchpad.py |   16 ++++++++++------
+ extensions/globalkey/Makefile.am  |    1 +
+ extensions/globalkey/touchpad.py  |   33 +++++++++++++++++++++++++++++++++
+ 3 files changed, 44 insertions(+), 6 deletions(-)
+ create mode 100644 extensions/globalkey/touchpad.py
+
+diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py
+index 6773afc..ba02037 100644
+--- a/extensions/deviceicon/touchpad.py
++++ b/extensions/deviceicon/touchpad.py
+@@ -45,6 +45,8 @@
+ # NODE_PATH is used to communicate with the touchpad device.
+ NODE_PATH = '/sys/devices/platform/i8042/serio1/ptmode'
+ 
++_view = None
++
+ 
+ class DeviceView(TrayIcon):
+     """ Manage the touchpad mode from the device palette on the Frame. """
+@@ -66,14 +68,14 @@ def create_palette(self):
+         """ Create a palette for this icon; called by the Sugar framework
+         when a palette needs to be displayed. """
+         label = glib.markup_escape_text(_('My touchpad'))
+-        self.palette = ResourcePalette(label, self.icon)
+-        self.palette.set_group_id('frame')
+-        return self.palette
++        self._palette = ResourcePalette(label, self.icon)
++        self._palette.set_group_id('frame')
++        return self._palette
+ 
+     def __button_release_event_cb(self, widget, event):
+         """ Callback for button release event; used to invoke touchpad-mode
+         change. """
+-        self.palette.toggle_mode()
++        self._palette.toggle_mode()
+         return True
+ 
+ 
+@@ -111,10 +113,12 @@ def toggle_mode(self):
+ 
+ 
+ def setup(tray):
+-    """ Initialize the devic icon; called by the shell when initializing the
++    """ Initialize the device icon; called by the shell when initializing the
+     Frame. """
++    global _view
+     if os.path.exists(NODE_PATH):
+-        tray.add_device(DeviceView())
++        _view = DeviceView()
++        tray.add_device(_view)
+         _write_touchpad_mode(TOUCHPAD_MODE_CAPACITIVE)
+ 
+ 
+diff --git a/extensions/globalkey/Makefile.am b/extensions/globalkey/Makefile.am
+index b44626e..e3aaa8a 100644
+--- a/extensions/globalkey/Makefile.am
++++ b/extensions/globalkey/Makefile.am
+@@ -4,5 +4,6 @@ sugar_PYTHON = 		\
+ 	__init__.py	\
+ 	magnifier.py	\
+ 	screenshot.py	\
++	touchpad.py	\
+ 	viewsource.py	\
+ 	virtualkeyboard.py
+diff --git a/extensions/globalkey/touchpad.py b/extensions/globalkey/touchpad.py
+new file mode 100644
+index 0000000..eeaba40
+--- /dev/null
++++ b/extensions/globalkey/touchpad.py
+@@ -0,0 +1,33 @@
++# Copyright (C) 2010, Martin Abente
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++import logging
++
++BOUND_KEYS = ['<alt>m']
++touchpad = None
++
++def handle_key_press(key):
++    global touchpad
++    if touchpad is None:
++        try:
++            touchpad = __import__('deviceicon.touchpad', globals(),
++                                   locals(), ['touchpad'])
++        except Exception:
++            logging.error('Could not import touchpad module.')
++            return
++
++    if touchpad._view is not None:
++        touchpad._view._palette.toggle_mode()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0041-Dextrose-Escape-all-text-passed-to-Palette.primary_t.patch b/rpms/sugar/0041-Dextrose-Escape-all-text-passed-to-Palette.primary_t.patch
new file mode 100644
index 0000000..4ec2b7f
--- /dev/null
+++ b/rpms/sugar/0041-Dextrose-Escape-all-text-passed-to-Palette.primary_t.patch
@@ -0,0 +1,32 @@
+From cecd2a7a9af344292b6b274afb6007f56857d453 Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <silbe@activitycentral.com>
+Date: Sat, 25 Jun 2011 12:12:55 +0200
+Subject: [PATCH sugar 41/74] Dextrose: Escape all text passed to
+ Palette.primary_text and .secondary_text
+
+sugar.graphics.palette.Palette passes primary_text and secondary_text through
+to GTK without escaping it, so we need to make sure it doesn't contain
+anything special in user data (activity title, bundle_id, nick name, etc.) or
+translations.
+
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ src/jarabe/view/palettes.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
+index 02648b7..7a17f32 100644
+--- a/src/jarabe/view/palettes.py
++++ b/src/jarabe/view/palettes.py
+@@ -303,7 +303,7 @@ class JournalXSPalette(Palette):
+     def __init__(self, xs_hostname):
+         Palette.__init__(self, _('School Server'))
+ 
+-        self.props.secondary_text = xs_hostname
++        self.props.secondary_text = glib.markup_escape_text(xs_hostname)
+ 
+         vbox = gtk.VBox()
+         self.set_content(vbox)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0042-Database-support-for-3G-control-panel.patch b/rpms/sugar/0042-Database-support-for-3G-control-panel.patch
new file mode 100644
index 0000000..b169a97
--- /dev/null
+++ b/rpms/sugar/0042-Database-support-for-3G-control-panel.patch
@@ -0,0 +1,494 @@
+From e6412a96e8f7b7e9a498b4d300cccb0acd50abe6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9s=20Ambrois?= <andresambrois@gmail.com>
+Date: Tue, 11 Jan 2011 19:52:52 +0000
+Subject: [PATCH sugar 42/74] Database support for 3G control panel
+
+For more information please look at #1630
+---
+ configure.ac                                       |    1 +
+ .../cpsection/modemconfiguration/Makefile.am       |    2 +
+ .../cpsection/modemconfiguration/config.py.in      |   20 +++
+ extensions/cpsection/modemconfiguration/model.py   |  123 ++++++++++++++
+ extensions/cpsection/modemconfiguration/view.py    |  177 ++++++++++++++++----
+ 5 files changed, 290 insertions(+), 33 deletions(-)
+ create mode 100644 extensions/cpsection/modemconfiguration/config.py.in
+ mode change 100755 => 100644 extensions/cpsection/modemconfiguration/model.py
+
+diff --git a/configure.ac b/configure.ac
+index df9614f..86f6116 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,7 @@ extensions/cpsection/frame/Makefile
+ extensions/cpsection/keyboard/Makefile
+ extensions/cpsection/language/Makefile
+ extensions/cpsection/modemconfiguration/Makefile
++extensions/cpsection/modemconfiguration/config.py
+ extensions/cpsection/Makefile
+ extensions/cpsection/network/Makefile
+ extensions/cpsection/power/Makefile
+diff --git a/extensions/cpsection/modemconfiguration/Makefile.am b/extensions/cpsection/modemconfiguration/Makefile.am
+index 3e2613e..525e02e 100644
+--- a/extensions/cpsection/modemconfiguration/Makefile.am
++++ b/extensions/cpsection/modemconfiguration/Makefile.am
+@@ -4,3 +4,5 @@ sugar_PYTHON = 		\
+ 	__init__.py	\
+ 	model.py	\
+ 	view.py		
++
++nodist_sugar_PYTHON = config.py
+diff --git a/extensions/cpsection/modemconfiguration/config.py.in b/extensions/cpsection/modemconfiguration/config.py.in
+new file mode 100644
+index 0000000..6fa688e
+--- /dev/null
++++ b/extensions/cpsection/modemconfiguration/config.py.in
+@@ -0,0 +1,20 @@
++# -*- encoding: utf-8 -*-
++# Copyright (C) 2010 Andrés Ambrois
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
++
++PROVIDERS_PATH = "@prefix@/share/mobile-broadband-provider-info/serviceproviders.xml"
++PROVIDERS_FORMAT_SUPPORTED = "2.0"
++COUNTRY_CODES_PATH = "@prefix@/share/zoneinfo/iso3166.tab"
+diff --git a/extensions/cpsection/modemconfiguration/model.py b/extensions/cpsection/modemconfiguration/model.py
+old mode 100755
+new mode 100644
+index 1e83c44..ca9f75c
+--- a/extensions/cpsection/modemconfiguration/model.py
++++ b/extensions/cpsection/modemconfiguration/model.py
+@@ -15,11 +15,22 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
+ 
+ import gconf
++import gtk
++import os
++import locale
++import logging
++
++from xml.etree.cElementTree import ElementTree
++from gettext import gettext as _
+ 
+ from jarabe.model.network import GSM_USERNAME_PATH, GSM_PASSWORD_PATH, \
+                                  GSM_NUMBER_PATH, GSM_APN_PATH, GSM_PIN_PATH, \
+                                  GSM_PUK_PATH
+ 
++from cpsection.modemconfiguration.config import PROVIDERS_PATH, \
++                                                PROVIDERS_FORMAT_SUPPORTED, \
++                                                COUNTRY_CODES_PATH
++
+ 
+ def get_username():
+     client = gconf.client_get_default()
+@@ -79,3 +90,115 @@ def set_pin(pin):
+ def set_puk(puk):
+     client = gconf.client_get_default()
+     client.set_string(GSM_PUK_PATH, puk)
++
++
++def has_providers_db():
++    if not os.path.isfile(COUNTRY_CODES_PATH):
++        logging.debug("Mobile broadband provider database: Country " \
++                          "codes path %s not found.", COUNTRY_CODES_PATH)
++        return False
++    try:
++        tree = ElementTree(file=PROVIDERS_PATH)
++    except (IOError, SyntaxError), e:
++        logging.debug("Mobile broadband provider database: Could not read " \
++                          "provider information %s error=%s", PROVIDERS_PATH)
++        return False
++    else:
++        elem = tree.getroot()
++        if elem is None or elem.get('format') != PROVIDERS_FORMAT_SUPPORTED:
++            logging.debug("Mobile broadband provider database: Could not " \
++                          "read provider information. %s is wrong format.",
++                          elem.get('format'))
++            return False
++        return True
++
++
++class CountryListStore(gtk.ListStore):
++    COUNTRY_CODE = locale.getdefaultlocale()[0][3:5].lower()
++
++    def __init__(self):
++        gtk.ListStore.__init__(self, str, object)
++        codes = {}
++        with open(COUNTRY_CODES_PATH) as codes_file:
++            for line in codes_file:
++                if line.startswith('#'):
++                    continue
++                code, name = line.split('\t')[:2]
++                codes[code.lower()] = name.strip()
++        etree = ElementTree(file=PROVIDERS_PATH).getroot()
++        self._country_idx = None
++        i = 0
++        for elem in etree.findall('.//country'):
++            code = elem.attrib['code']
++            if code == self.COUNTRY_CODE:
++                self._country_idx = i
++            else:
++                i += 1
++            if code in codes:
++                self.append((codes[code], elem))
++            else:
++                self.append((code, elem))
++
++    def get_row_providers(self, row):
++        return self[row][1]
++
++    def guess_country_row(self):
++        if self._country_idx is not None:
++            return self._country_idx
++        else:
++            return -1
++
++
++class ProviderListStore(gtk.ListStore):
++    def __init__(self, elem):
++        gtk.ListStore.__init__(self, str, object)
++        for provider_elem in elem.findall('.//provider'):
++            apns = provider_elem.findall('.//apn')
++            if not apns:
++                # Skip carriers with CDMA entries only
++                continue
++            self.append((provider_elem.find('.//name').text, apns))
++
++    def get_row_plans(self, row):
++        return self[row][1]
++
++
++class PlanListStore(gtk.ListStore):
++    LANG_NS_ATTR = '{http://www.w3.org/XML/1998/namespace}lang'
++    LANG = locale.getdefaultlocale()[0][:2]
++    DEFAULT_NUMBER = '*99#'
++
++    def __init__(self, elems):
++        gtk.ListStore.__init__(self, str, object)
++        for apn_elem in elems:
++            plan = {}
++            names = apn_elem.findall('.//name')
++            if names:
++                for name in names:
++                    if name.get(self.LANG_NS_ATTR) is None:
++                        # serviceproviders.xml default value
++                        plan['name'] = name.text
++                    elif name.get(self.LANG_NS_ATTR) == self.LANG:
++                        # Great! We found a name value for our locale!
++                        plan['name'] = name.text
++                        break
++            else:
++                plan['name'] = _('Default')
++            plan['apn'] = apn_elem.get('value')
++            user = apn_elem.find('.//username')
++            if user is not None:
++                plan['username'] = user.text
++            else:
++                plan['username'] = ''
++            passwd = apn_elem.find('.//password')
++            if passwd is not None:
++                plan['password'] = passwd.text
++            else:
++                plan['password'] = ''
++
++            plan['number'] = self.DEFAULT_NUMBER
++
++            self.append((plan['name'], plan))
++
++    def get_row_plan(self, row):
++        return self[row][1]
+diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
+index c31edba..fad141d 100644
+--- a/extensions/cpsection/modemconfiguration/view.py
++++ b/extensions/cpsection/modemconfiguration/view.py
+@@ -14,8 +14,6 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
+ 
+-import os
+-import logging
+ from gettext import gettext as _
+ 
+ import gtk
+@@ -33,7 +31,7 @@ class EntryWithLabel(gtk.HBox):
+     __gtype_name__ = 'SugarEntryWithLabel'
+ 
+     def __init__(self, label_text):
+-        gtk.HBox.__init__(self, spacing=style.DEFAULT_SPACING)
++        gtk.HBox.__init__(self, spacing=style.DEFAULT_SPACING * 2)
+ 
+         self._timeout_sid = 0
+         self._changed_handler = None
+@@ -46,11 +44,11 @@ def __init__(self, label_text):
+         self.pack_start(self.label, expand=False)
+         self.label.show()
+ 
+-        self._entry = gtk.Entry(25)
+-        self._entry.connect('changed', self.__entry_changed_cb)
+-        self._entry.set_width_chars(25)
+-        self.pack_start(self._entry, expand=False)
+-        self._entry.show()
++        self.entry = gtk.Entry(25)
++        self.entry.connect('changed', self.__entry_changed_cb)
++        self.entry.set_width_chars(25)
++        self.pack_start(self.entry, expand=False)
++        self.entry.show()
+ 
+     def __entry_changed_cb(self, widget, data=None):
+         if self._timeout_sid:
+@@ -61,11 +59,11 @@ def __entry_changed_cb(self, widget, data=None):
+     def __timeout_cb(self):
+         self._timeout_sid = 0
+ 
+-        if self._entry.get_text() == self.get_value():
++        if self.entry.get_text() == self.get_value():
+             return False
+ 
+         try:
+-            self.set_value(self._entry.get_text())
++            self.set_value(self.entry.get_text())
+         except ValueError:
+             self._is_valid = False
+         else:
+@@ -76,16 +74,17 @@ def __timeout_cb(self):
+         return False
+ 
+     def set_text_from_model(self):
+-        self._entry.set_text(self.get_value())
++        self.entry.set_text(self.get_value())
+ 
+     def get_value(self):
+         raise NotImplementedError
+ 
+-    def set_value(self):
++    def set_value(self, value):
+         raise NotImplementedError
+ 
+     def _get_is_valid(self):
+         return self._is_valid
++
+     is_valid = gobject.property(type=bool, getter=_get_is_valid, default=True)
+ 
+ 
+@@ -168,60 +167,149 @@ def __init__(self, model, alerts=None):
+         self._model = model
+         self.restart_alerts = alerts
+ 
+-        self.set_border_width(style.DEFAULT_SPACING)
+         self.set_spacing(style.DEFAULT_SPACING)
+-        self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
++
++        label_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
++        combo_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
++
++        scrolled_win = gtk.ScrolledWindow()
++        scrolled_win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
++        scrolled_win.show()
++        self.add(scrolled_win)
++
++        main_box = gtk.VBox(spacing=style.DEFAULT_SPACING)
++        main_box.set_border_width(style.DEFAULT_SPACING)
++        main_box.show()
++        scrolled_win.add_with_viewport(main_box)
+ 
+         explanation = _('You will need to provide the following information'
+                         ' to set up a mobile broadband connection to a'
+                         ' cellular (3G) network.')
+         self._text = gtk.Label(explanation)
+-        self._text.set_width_chars(100)
+         self._text.set_line_wrap(True)
+         self._text.set_alignment(0, 0)
+-        self.pack_start(self._text, False)
++        main_box.pack_start(self._text, False)
+         self._text.show()
+ 
++        if model.has_providers_db():
++            self._upper_box = gtk.VBox(spacing=style.DEFAULT_SPACING)
++            self._upper_box.set_border_width(style.DEFAULT_SPACING)
++            main_box.pack_start(self._upper_box, expand=False)
++            self._upper_box.show()
++
++
++            box = gtk.HBox(spacing=style.DEFAULT_SPACING * 2)
++            label = gtk.Label(_('Country:'))
++            label.set_alignment(1, 0.5)
++            label_group.add_widget(label)
++            box.pack_start(label, False)
++            label.show()
++            country_store = model.CountryListStore()
++            country_combo = gtk.ComboBox(country_store)
++            combo_group.add_widget(country_combo)
++            cell = gtk.CellRendererText()
++            cell.props.xalign = 0.5
++            country_combo.pack_start(cell)
++            country_combo.add_attribute(cell, 'text', 0)
++            country_combo.connect('changed', self.__country_selected_cb)
++            box.pack_start(country_combo, False)
++            country_combo.show()
++            self._upper_box.pack_start(box, False)
++            box.show()
++
++            box = gtk.HBox(spacing=style.DEFAULT_SPACING * 2)
++            label = gtk.Label(_('Provider:'))
++            label.set_alignment(1, 0.5)
++            label_group.add_widget(label)
++            box.pack_start(label, False)
++            label.show()
++            self._providers_combo = gtk.ComboBox()
++            combo_group.add_widget(self._providers_combo)
++            cell = gtk.CellRendererText()
++            cell.props.xalign = 0.5
++            self._providers_combo.pack_start(cell)
++            self._providers_combo.add_attribute(cell, 'text', 0)
++            self._providers_combo.connect('changed',
++                                          self.__provider_selected_cb)
++            box.pack_start(self._providers_combo, False)
++            self._providers_combo.show()
++            self._upper_box.pack_start(box, False)
++            box.show()
++
++            box = gtk.HBox(spacing=style.DEFAULT_SPACING*2)
++            label = gtk.Label(_('Plan:'))
++            label.set_alignment(1, 0.5)
++            label_group.add_widget(label)
++            box.pack_start(label, False)
++            label.show()
++            self._plan_combo = gtk.ComboBox()
++            combo_group.add_widget(self._plan_combo)
++            cell = gtk.CellRendererText()
++            cell.props.xalign = 0.5
++            self._plan_combo.pack_start(cell)
++            self._plan_combo.add_attribute(cell, 'text', 0)
++            self._plan_combo.connect('changed', self.__plan_selected_cb)
++            box.pack_start(self._plan_combo, False)
++            self._plan_combo.show()
++            self._upper_box.pack_start(box, False)
++            box.show()
++
++            country_combo.set_active(country_store.guess_country_row())
++
++            separator = gtk.HSeparator()
++            main_box.pack_start(separator, False)
++            separator.show()
++
++        self._lower_box = gtk.VBox(spacing=style.DEFAULT_SPACING)
++        self._lower_box.set_border_width(style.DEFAULT_SPACING)
++        main_box.pack_start(self._lower_box, expand=False)
++        self._lower_box.show()
++
+         self._username_entry = UsernameEntry(model)
+         self._username_entry.connect('notify::is-valid',
+                                      self.__notify_is_valid_cb)
+-        self._group.add_widget(self._username_entry.label)
+-        self.pack_start(self._username_entry, expand=False)
++        label_group.add_widget(self._username_entry.label)
++        combo_group.add_widget(self._username_entry.entry)
++        self._lower_box.pack_start(self._username_entry, fill=False)
+         self._username_entry.show()
+ 
+         self._password_entry = PasswordEntry(model)
+         self._password_entry.connect('notify::is-valid',
+                                      self.__notify_is_valid_cb)
+-        self._group.add_widget(self._password_entry.label)
+-        self.pack_start(self._password_entry, expand=False)
++        label_group.add_widget(self._password_entry.label)
++        combo_group.add_widget(self._password_entry.entry)
++        self._lower_box.pack_start(self._password_entry, fill=False)
+         self._password_entry.show()
+ 
+         self._number_entry = NumberEntry(model)
+         self._number_entry.connect('notify::is-valid',
+                                    self.__notify_is_valid_cb)
+-        self._group.add_widget(self._number_entry.label)
+-        self.pack_start(self._number_entry, expand=False)
++        label_group.add_widget(self._number_entry.label)
++        combo_group.add_widget(self._number_entry.entry)
++        self._lower_box.pack_start(self._number_entry, fill=False)
+         self._number_entry.show()
+ 
+         self._apn_entry = ApnEntry(model)
+         self._apn_entry.connect('notify::is-valid',
+                                 self.__notify_is_valid_cb)
+-        self._group.add_widget(self._apn_entry.label)
+-        self.pack_start(self._apn_entry, expand=False)
++        label_group.add_widget(self._apn_entry.label)
++        combo_group.add_widget(self._apn_entry.entry)
++        self._lower_box.pack_start(self._apn_entry, fill=False)
+         self._apn_entry.show()
+ 
+         self._pin_entry = PinEntry(model)
+         self._pin_entry.connect('notify::is-valid',
+                                 self.__notify_is_valid_cb)
+-        self._group.add_widget(self._pin_entry.label)
+-        self.pack_start(self._pin_entry, expand=False)
++        label_group.add_widget(self._pin_entry.label)
++        self._lower_box.pack_start(self._pin_entry, fill=False)
+         self._pin_entry.show()
+ 
+         self._puk_entry = PukEntry(model)
+         self._puk_entry.connect('notify::is-valid',
+                                 self.__notify_is_valid_cb)
+-        self._group.add_widget(self._puk_entry.label)
+-        self.pack_start(self._puk_entry, expand=False)
++        label_group.add_widget(self._puk_entry.label)
++        combo_group.add_widget(self._puk_entry.entry)
++        self._lower_box.pack_start(self._puk_entry, fill=False)
+         self._puk_entry.show()
+ 
+         self.setup()
+@@ -239,14 +327,37 @@ def setup(self):
+     def undo(self):
+         self._model.undo()
+ 
++    def __country_selected_cb(self, combo):
++        model = combo.get_model()
++        providers = model.get_row_providers(combo.get_active())
++        self._providers_combo.set_model(
++            self._model.ProviderListStore(providers))
++
++    def __provider_selected_cb(self, combo):
++        model = combo.get_model()
++        plans = model.get_row_plans(combo.get_active())
++        self._plan_combo.set_model(self._model.PlanListStore(plans))
++
++    def __plan_selected_cb(self, combo):
++        model = combo.get_model()
++        plan = model.get_row_plan(combo.get_active())
++        self._username_entry.set_value(plan['username'])
++        self._username_entry.set_text_from_model()
++        self._password_entry.set_value(plan['password'])
++        self._password_entry.set_text_from_model()
++        self._number_entry.set_value(plan['number'])
++        self._number_entry.set_text_from_model()
++        self._apn_entry.set_value(plan['apn'])
++        self._apn_entry.set_text_from_model()
++
+     def _validate(self):
+         if self._username_entry.is_valid and \
+-            self._password_entry.is_valid and \
++                self._password_entry.is_valid and \
+                 self._number_entry.is_valid and \
+-                    self._apn_entry.is_valid and \
+-                        self._pin_entry.is_valid and \
+-                            self._puk_entry.is_valid:
+-                                self.props.is_valid = True
++                self._apn_entry.is_valid and \
++                self._pin_entry.is_valid and \
++                self._puk_entry.is_valid:
++            self.props.is_valid = True
+         else:
+             self.props.is_valid = False
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0043-Fix-no-restart-after-provider-info-selection.patch b/rpms/sugar/0043-Fix-no-restart-after-provider-info-selection.patch
new file mode 100644
index 0000000..ec9cc4e
--- /dev/null
+++ b/rpms/sugar/0043-Fix-no-restart-after-provider-info-selection.patch
@@ -0,0 +1,42 @@
+From a65cd94c79bf0cddf35316401a2f2d916e41734d Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Tue, 11 Jan 2011 19:54:07 +0000
+Subject: [PATCH sugar 43/74] Fix no restart after provider info selection
+
+Current 3g provider information selection logic bypassed the
+validation process, thefore no restart was required.
+
+Note that changes in the current session does not modify
+the current loaded connection information, and since the
+connection information is loaded at startup, restart is
+required.
+---
+ extensions/cpsection/modemconfiguration/view.py |   12 ++++--------
+ 1 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
+index fad141d..a16de88 100644
+--- a/extensions/cpsection/modemconfiguration/view.py
++++ b/extensions/cpsection/modemconfiguration/view.py
+@@ -341,14 +341,10 @@ def __provider_selected_cb(self, combo):
+     def __plan_selected_cb(self, combo):
+         model = combo.get_model()
+         plan = model.get_row_plan(combo.get_active())
+-        self._username_entry.set_value(plan['username'])
+-        self._username_entry.set_text_from_model()
+-        self._password_entry.set_value(plan['password'])
+-        self._password_entry.set_text_from_model()
+-        self._number_entry.set_value(plan['number'])
+-        self._number_entry.set_text_from_model()
+-        self._apn_entry.set_value(plan['apn'])
+-        self._apn_entry.set_text_from_model()
++        self._username_entry.entry.set_text(plan['username'])
++        self._password_entry.entry.set_text(plan['password'])
++        self._number_entry.entry.set_text(plan['number'])
++        self._apn_entry.entry.set_text(plan['apn'])
+ 
+     def _validate(self):
+         if self._username_entry.is_valid and \
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0044-MAY-CONTAIN-TYPO-Flickering-and-unknown-icons-in-the.patch b/rpms/sugar/0044-MAY-CONTAIN-TYPO-Flickering-and-unknown-icons-in-the.patch
new file mode 100644
index 0000000..898e00f
--- /dev/null
+++ b/rpms/sugar/0044-MAY-CONTAIN-TYPO-Flickering-and-unknown-icons-in-the.patch
@@ -0,0 +1,81 @@
+From 8589f886f92bba68e0b6333bc6873d5680e326ab Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Mon, 18 Jul 2011 20:39:06 +0200
+Subject: [PATCH sugar 44/74] MAY CONTAIN TYPO: Flickering and unknown icons
+ in the window bar #870
+
+---
+ src/jarabe/journal/misc.py  |    3 ++-
+ src/jarabe/view/launcher.py |    9 ++++++---
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
+index fac56ad..2c5d39a 100644
+--- a/src/jarabe/journal/misc.py
++++ b/src/jarabe/journal/misc.py
+@@ -263,7 +263,8 @@ def launch(bundle, activity_id=None, object_id=None, uri=None, color=None,
+         client = gconf.client_get_default()
+         color = XoColor(client.get_string('/desktop/sugar/user/color'))
+ 
+-    launcher.add_launcher(activity_id, bundle.get_icon(), color)
++    launcher.add_launcher(activity_id, bundle.get_bundle_id(),
++                          bundle.get_icon(), color)
+     activity_handle = ActivityHandle(activity_id=activity_id,
+             object_id=object_id, uri=uri, invited=invited)
+     activityfactory.create(bundle, activity_handle)
+diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
+index 5c645c4..44f49bb 100644
+--- a/src/jarabe/view/launcher.py
++++ b/src/jarabe/view/launcher.py
+@@ -29,7 +29,7 @@
+ 
+ class LaunchWindow(gtk.Window):
+ 
+-    def __init__(self, activity_id, icon_path, icon_color):
++    def __init__(self, activity_id, bundle_id, icon_path, icon_color):
+         gobject.GObject.__init__(self)
+ 
+         self.props.type_hint = gtk.gdk.WINDOW_TYPE_HINT_NORMAL
+@@ -48,6 +48,7 @@ def __init__(self, activity_id, icon_path, icon_color):
+         canvas.pack_start(header, expand=False)
+ 
+         self._activity_id = activity_id
++        self._bundle_id = bundle_id
+ 
+         self._activity_icon = PulsingIcon(file=icon_path,
+                                           pixel_size=style.XLARGE_ICON_SIZE)
+@@ -93,6 +94,7 @@ def _update_size(self):
+         self.resize(gtk.gdk.screen_width(), gtk.gdk.screen_height())
+ 
+     def __realize_cb(self, widget):
++        wm.set_bundle_id(widget.window, str(self._bundle_id))
+         wm.set_activity_id(widget.window, str(self._activity_id))
+         widget.window.property_change('_SUGAR_WINDOW_TYPE', 'STRING', 8,
+                                       gtk.gdk.PROP_MODE_REPLACE, 'launcher')
+@@ -118,13 +120,13 @@ def setup():
+     model.connect('launch-completed', __launch_completed_cb)
+ 
+ 
+-def add_launcher(activity_id, icon_path, icon_color):
++def add_launcher(activity_id, bundle_id, icon_path, icon_color):
+     model = shell.get_model()
+ 
+     if model.get_launcher(activity_id) is not None:
+         return
+ 
+-    launch_window = LaunchWindow(activity_id, icon_path, icon_color)
++    launch_window = LaunchWindow(activity_id, bundle_id, icon_path, icon_color)
+     launch_window.show()
+ 
+     model.register_launcher(activity_id, launch_window)
+@@ -132,6 +134,7 @@ def add_launcher(activity_id, icon_path, icon_color):
+ 
+ def __launch_started_cb(home_model, home_activity):
+     add_launcher(home_activity.get_activity_id(),
++            home_activity.get_bundle_id(),
+             home_activity.get_icon_path(), home_activity.get_icon_color())
+ 
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0045-Clipboard-menu-off-screen-2201.patch b/rpms/sugar/0045-Clipboard-menu-off-screen-2201.patch
new file mode 100644
index 0000000..d09d04d
--- /dev/null
+++ b/rpms/sugar/0045-Clipboard-menu-off-screen-2201.patch
@@ -0,0 +1,26 @@
+From 36ab56d8a68660bc1a727f1ef2af000eb00c641b Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Fri, 17 Dec 2010 16:37:05 +0000
+Subject: [PATCH sugar 45/74] Clipboard menu off screen #2201
+
+Rely on sugar-toolkit in setting most appropriate text_maxlen
+---
+ src/jarabe/frame/clipboardmenu.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
+index 4c077d9..7d0dd36 100644
+--- a/src/jarabe/frame/clipboardmenu.py
++++ b/src/jarabe/frame/clipboardmenu.py
+@@ -41,7 +41,7 @@
+ class ClipboardMenu(Palette):
+ 
+     def __init__(self, cb_object):
+-        Palette.__init__(self, text_maxlen=100)
++        Palette.__init__(self)
+ 
+         self._cb_object = cb_object
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0046-Add-lease-duration-information-in-about-my-computer.patch b/rpms/sugar/0046-Add-lease-duration-information-in-about-my-computer.patch
new file mode 100644
index 0000000..36ce7a7
--- /dev/null
+++ b/rpms/sugar/0046-Add-lease-duration-information-in-about-my-computer.patch
@@ -0,0 +1,94 @@
+From 85297850f1791781aedcf33b170f5ae3d2d6e079 Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@sugarlabs.org>
+Date: Thu, 20 Jan 2011 23:18:42 -0300
+Subject: [PATCH sugar 46/74] Add lease duration information in about my
+ computer
+
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+---
+ extensions/cpsection/aboutcomputer/model.py |   28 +++++++++++++++++++++++++++
+ extensions/cpsection/aboutcomputer/view.py  |   15 ++++++++++++++
+ 2 files changed, 43 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
+index 431c9c0..52a1094 100644
+--- a/extensions/cpsection/aboutcomputer/model.py
++++ b/extensions/cpsection/aboutcomputer/model.py
+@@ -21,6 +21,7 @@
+ import subprocess
+ from gettext import gettext as _
+ import errno
++from datetime import datetime
+ 
+ import dbus
+ 
+@@ -39,6 +40,9 @@
+ _SN = 'serial-number'
+ _MODEL = 'openprom/model'
+ 
++_XO_1_0_LEASE_PATH = '/security/lease.sig'
++_XO_1_5_LEASE_PATH = '/bootpart/boot/security/lease.sig'
++
+ _logger = logging.getLogger('ControlPanel - AboutComputer')
+ _not_available = _('Not available')
+ 
+@@ -53,6 +57,30 @@ def print_aboutcomputer():
+     print get_aboutcomputer()
+ 
+ 
++def _get_lease_path():
++    if os.path.exists(_XO_1_0_LEASE_PATH):
++        return _XO_1_0_LEASE_PATH
++    elif os.path.exists(_XO_1_5_LEASE_PATH):
++        return _XO_1_5_LEASE_PATH
++    else:
++        return ''
++
++
++def get_lease_days():
++    lease_file = _read_file(_get_lease_path())
++    if lease_file is None:
++        return _not_available
++
++    encoded_date = str(str.split(lease_file)[3])
++    expiry_date = datetime.strptime(encoded_date
++            , '%Y%m%dT%H%M%SZ')
++    current_date = datetime.today()
++    days_remaining = (expiry_date - current_date).days
++    #TODO: gettext str_days_remaining
++    str_days_remaining = str(days_remaining) + ' days remaining'
++    return str_days_remaining
++
++
+ def get_serial_number():
+     serial_no = None
+     if os.path.exists(os.path.join(_OFW_TREE, _SN)):
+diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
+index 257e165..d719372 100644
+--- a/extensions/cpsection/aboutcomputer/view.py
++++ b/extensions/cpsection/aboutcomputer/view.py
+@@ -79,6 +79,21 @@ def _setup_identity(self):
+         vbox_identity.pack_start(box_identity, expand=False)
+         box_identity.show()
+ 
++        box_lease = gtk.HBox(spacing=style.DEFAULT_SPACING)
++        label_lease = gtk.Label(_('Lease: '))
++        label_lease.set_alignment(1, 0)
++        label_lease.modify_fg(gtk.STATE_NORMAL,
++                              style.COLOR_SELECTION_GREY.get_gdk_color())
++        box_lease.pack_start(label_lease, expand=False)
++        self._group.add_widget(label_lease)
++        label_lease.show()
++        label_lease_ver = gtk.Label(self._model.get_lease_days())
++        label_lease_ver.set_alignment(0, 0)
++        box_lease.pack_start(label_lease_ver, expand=False)
++        label_lease_ver.show()
++        vbox_identity.pack_start(box_lease, expand=False)
++        box_lease.show()
++
+         self._vbox.pack_start(vbox_identity, expand=False)
+         vbox_identity.show()
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0047-Extend-sugar-launch-with-more-options.patch b/rpms/sugar/0047-Extend-sugar-launch-with-more-options.patch
new file mode 100644
index 0000000..6102e78
--- /dev/null
+++ b/rpms/sugar/0047-Extend-sugar-launch-with-more-options.patch
@@ -0,0 +1,45 @@
+From f17357af17f782b720b6b8c3126dfe54fd1b778f Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Wed, 19 Jan 2011 20:20:35 +0000
+Subject: [PATCH sugar 47/74] Extend sugar-launch with more options
+
+Add activity_id, object_id and uri options.
+
+This patch is necessary in order to use Browse
+as the default http uri handler in sugar.
+Reviewed-by: Aleksey Lim <alsroot@member.fsf.org>
+---
+ bin/sugar-launch |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/bin/sugar-launch b/bin/sugar-launch
+index 7297a8e..18c0bb7 100644
+--- a/bin/sugar-launch
++++ b/bin/sugar-launch
+@@ -28,6 +28,13 @@ usage = "usage: %prog [options] activity"
+ parser = OptionParser(usage)
+ parser.add_option("-d", "--debug", action="store_true", dest="debug",
+                   help="launch activity inside gdb")
++parser.add_option("-a", "--activity_id", action="store", dest="activity_id",
++                  help="unique id for the activity to be launched")
++parser.add_option("-o", "--object_id", action="store", dest="object_id",
++                  help="identity of the journal object associated with" \
++                  " the activity")
++parser.add_option("-u", "--uri", action="store", dest="uri",
++                  help="URI associated with the activity")
+ (options, args) = parser.parse_args()
+ 
+ if len(args) == 0:
+@@ -42,7 +49,8 @@ if not path:
+     sys.exit(1)
+ 
+ activity = ActivityBundle(path)
+-cmd_args = activityfactory.get_command(activity)
++cmd_args = activityfactory.get_command(activity, options.activity_id,
++                                options.object_id, options.uri)
+ 
+ def _which(exec_file):
+     if 'PATH' in os.environ:
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0048-Show-register-gconf-value.patch b/rpms/sugar/0048-Show-register-gconf-value.patch
new file mode 100644
index 0000000..b4af581
--- /dev/null
+++ b/rpms/sugar/0048-Show-register-gconf-value.patch
@@ -0,0 +1,71 @@
+From ab1b99cb8b44474f95722c94bd6b489e552e2bce Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Mon, 18 Jul 2011 20:50:32 +0200
+Subject: [PATCH sugar 48/74] Show register gconf value
+
+Add a new gconf show_register value in the sugar scheme. This value
+determines whether or not the Register option will be displayed at
+the buddy icon palette.
+
+This is a request from Abhishek Singh at Nepal.
+
+Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
+---
+ data/sugar.schemas.in               |   12 ++++++++++++
+ src/jarabe/desktop/favoritesview.py |   10 ++++++++--
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index ba404ec..644678b 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -204,6 +204,18 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/desktop/sugar/show_register</key>
++      <applyto>/desktop/sugar/show_register</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Show Register</short>
++        <long>If TRUE, Sugar will show a "Register" option.</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/desktop/sugar/peripherals/keyboard/layouts</key>
+       <applyto>/desktop/sugar/peripherals/keyboard/layouts</applyto>
+       <owner>sugar</owner>
+diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
+index c2ff370..81e32c8 100644
+--- a/src/jarabe/desktop/favoritesview.py
++++ b/src/jarabe/desktop/favoritesview.py
+@@ -638,6 +638,14 @@ def create_palette(self):
+         palette = BuddyMenu(get_owner_instance())
+ 
+         client = gconf.client_get_default()
++        show_register = client.get_bool('/desktop/sugar/show_register')
++
++        if show_register:
++            self._create_register_menu(palette, client)
++
++        return palette
++
++    def _create_register_menu(self, palette, client):
+         backup_url = client.get_string('/desktop/sugar/backup_url')
+ 
+         if not backup_url:
+@@ -650,8 +658,6 @@ def create_palette(self):
+         palette.menu.append(self._register_menu)
+         self._register_menu.show()
+ 
+-        return palette
+-
+     def get_toplevel(self):
+         return hippo.get_canvas_for_item(self).get_toplevel()
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0049-Yum-updater-notifications-integration.patch b/rpms/sugar/0049-Yum-updater-notifications-integration.patch
new file mode 100644
index 0000000..4dade2a
--- /dev/null
+++ b/rpms/sugar/0049-Yum-updater-notifications-integration.patch
@@ -0,0 +1,86 @@
+From c1df98e7db463c4be76278d7716d069428bdd93d Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Thu, 17 Feb 2011 02:16:59 +0000
+Subject: [PATCH sugar 49/74] Yum-updater notifications integration
+
+Original-code: http://wiki.sugarlabs.org/go/Dextrose/Updater
+dextrose-port-by: Martin Abente <martin.abente.lahaye@gmail.com>
+
+VERSION 2 Including silbe's robustness suggestions.
+
+PLEASE REPLACE OLD PATCH WITH THIS ONE
+---
+ src/jarabe/desktop/homewindow.py |   36 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 36 insertions(+), 0 deletions(-)
+
+diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
+index 07deff7..f101757 100644
+--- a/src/jarabe/desktop/homewindow.py
++++ b/src/jarabe/desktop/homewindow.py
+@@ -18,6 +18,8 @@
+ 
+ import gobject
+ import gtk
++import dbus
++from gettext import gettext as _
+ 
+ from sugar.graphics import style
+ from sugar.graphics import palettegroup
+@@ -28,6 +30,7 @@
+ from jarabe.desktop.transitionbox import TransitionBox
+ from jarabe.model.shell import ShellModel
+ from jarabe.model import shell
++from jarabe.model import notifications
+ 
+ 
+ _HOME_PAGE = 0
+@@ -35,6 +38,12 @@
+ _MESH_PAGE = 2
+ _TRANSITION_PAGE = 3
+ 
++_DBUS_SYSTEM_IFACE = 'org.sugarlabs.system'
++_DBUS_SYSTEM_PATH = '/org/sugarlabs/system'
++_SYSTEM_REBOOT_ID = -1
++_SYSTEM_RELOGIN_ID = -2
++_SYSTEM_TIMEOUT = 5
++
+ _instance = None
+ 
+ 
+@@ -79,6 +88,33 @@ def __init__(self):
+         shell.get_model().zoom_level_changed.connect(
+                                      self.__zoom_level_changed_cb)
+ 
++        try:
++            systembus = dbus.SystemBus()
++        except dbus.DBusException:
++            logging.error('DBus SystemBus is not available')
++        else:
++            systembus.add_signal_receiver(self.__reboot_cb, 'Reboot',
++                                          _DBUS_SYSTEM_IFACE)
++            systembus.add_signal_receiver(self.__relogin_cb, 'Relogin',
++                                          _DBUS_SYSTEM_IFACE)
++
++    def _system_alert(self, replaces_id, app_icon, message):
++        service = notifications.get_service()
++        service.notification_received.send(self,app_name='system',
++                replaces_id=replaces_id, app_icon=app_icon,
++                summary=_('System alert'), body=message,
++                actions=[], hints={})
++
++    def __reboot_cb(self):
++        self._system_alert(_SYSTEM_REBOOT_ID, 'system-restart',
++                _('Please, reboot your computer to take into account ' \
++                        'new updates'))
++
++    def __relogin_cb(self):
++        self._system_alert(_SYSTEM_RELOGIN_ID, 'system-logout',
++                _('Please, restart Sugar to take into account ' \
++                        'new updates'))
++
+     def _deactivate_view(self, level):
+         group = palettegroup.get_group('default')
+         group.popdown()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0050-Patch-to-add-feedback-icon-to-frame.patch b/rpms/sugar/0050-Patch-to-add-feedback-icon-to-frame.patch
new file mode 100644
index 0000000..edc6e99
--- /dev/null
+++ b/rpms/sugar/0050-Patch-to-add-feedback-icon-to-frame.patch
@@ -0,0 +1,162 @@
+From 274fc4539ea8d2b2cd33ae60321fdfb629375e40 Mon Sep 17 00:00:00 2001
+From: Mukesh Gupta <mukeshgupta.2006@gmail.com>
+Date: Tue, 18 Jan 2011 07:54:15 +0000
+Subject: [PATCH sugar 50/74] Patch to add feedback icon to frame
+
+Signed-off-by: Mukesh Gupta <mukeshgupta.2006@gmail.com>
+---
+ extensions/deviceicon/Makefile.am |    4 +-
+ extensions/deviceicon/feedback.py |  129 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 132 insertions(+), 1 deletions(-)
+ create mode 100644 extensions/deviceicon/feedback.py
+
+diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.am
+index 3a74053..b38cbb3 100644
+--- a/extensions/deviceicon/Makefile.am
++++ b/extensions/deviceicon/Makefile.am
+@@ -8,4 +8,6 @@ sugar_PYTHON = 		\
+ 	speaker.py	\
+ 	touchpad.py	\
+ 	virtualkeyboard.py	\
+-	volume.py
++	volume.py	\
++	feedback.py
++	
+diff --git a/extensions/deviceicon/feedback.py b/extensions/deviceicon/feedback.py
+new file mode 100644
+index 0000000..dc40a6e
+--- /dev/null
++++ b/extensions/deviceicon/feedback.py
+@@ -0,0 +1,129 @@
++# Copyright (C) Mukesh Gupta <mukeshgupta.2006@gmail.com>
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++import logging
++from gettext import gettext as _
++import gconf
++import gtk
++from sugar.graphics import style
++from sugar.graphics.tray import TrayIcon
++from sugar.graphics.palette import Palette
++from sugar.graphics.xocolor import XoColor
++from jarabe.model import feedback_collector
++from jarabe.view import launcher
++from sugar.activity import activityfactory
++from jarabe.model import bundleregistry
++from sugar.activity.activityhandle import ActivityHandle
++
++_ICON_NAME = 'feedback-icon'
++
++class DeviceView(TrayIcon):
++    FRAME_POSITION_RELATIVE = 500
++    def __init__(self):
++        client = gconf.client_get_default()
++        self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
++        TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color)
++        self.create_palette()
++            
++    def create_palette(self):
++        logging.debug('palette created')
++        self.palette = BugsPalette(_('Bugs'))
++        self.palette.set_group_id('frame')
++        return self.palette
++
++
++class BugsPalette(Palette):  
++    
++    def __init__(self, primary_text):
++        Palette.__init__(self, primary_text)
++        self._level = 0        
++        self._status_label = gtk.Label()
++        self._status_label.show()
++        self.vbox = gtk.VBox()        
++        self.hbox = gtk.HBox()              
++        self.set_content(self.vbox)
++        self._bugs_count_text = gtk.Label()
++        self.vbox.pack_start(self._bugs_count_text,
++         padding = style.DEFAULT_PADDING)                      
++        self.vbox.pack_start(self.hbox, padding = style.DEFAULT_PADDING)
++        self.vbox.show()        
++        self.hbox.pack_start(self._status_label,
++         padding = style.DEFAULT_PADDING)
++        self.hbox.show()        
++        self._open_log_button = gtk.Button("Open Log")
++        self._open_log_button.connect("clicked",
++         self.__open_log_activity)
++        self.hbox.pack_start(self._open_log_button,
++         padding = style.DEFAULT_PADDING)        
++        self._send_report_button = gtk.Button("Send Report")
++        self._send_report_button.connect("clicked", self.__send_bug_report)
++        self.hbox.pack_start(self._send_report_button,
++         padding = style.DEFAULT_PADDING)       
++        self.__get_bug_count()
++        self._bugs_count_text.show()
++        self._open_log_button.show()
++        self._send_report_button.show()        
++    
++    def popup(self, immediate=False, state=None):
++        Palette.popup(self, immediate=immediate, state=state)
++        self.__update_bug_palette()
++        
++        
++    def __send_bug_report(self, button):
++        feedback_collector.submit()
++        
++    def __open_log_activity(self, path):
++        
++        registry = bundleregistry.get_registry()
++        bundle = registry.get_bundle('org.laptop.Log')
++        activity_id = activityfactory.create_activity_id()
++        client = gconf.client_get_default()
++        xo_color = XoColor(client.get_string('/desktop/sugar/user/color'))
++        launcher.add_launcher(activity_id, bundle.get_icon(), xo_color)
++        activityfactory.create(bundle, ActivityHandle(activity_id))
++            
++    def __get_bug_count(self):
++        """This method returns the total error count"""
++        bugs_count = 0
++        
++        
++        return bugs_count
++    
++    def __update_bug_palette(self):        
++        bugs_count = self.__get_bug_count()    
++        self._open_log_button.set_sensitive(False)
++        have_reports, have_errors = feedback_collector.stat()
++        #have_reports, have_errors=[True,False]
++        if have_errors:
++            self._open_log_button.set_sensitive(True)
++        else:
++            self._open_log_button.set_sensitive(False)
++        
++                
++        if have_reports:
++            self._send_report_button.set_sensitive(True)
++        else:
++            self._send_report_button.set_sensitive(False)
++                    
++        if bugs_count == 0:        
++            self._bugs_count_text.set_label('No Errors')
++        else :            
++            self._bugs_count_text.set_label(_('Total Errors: %d' %  bugs_count))
++ 
++def setup(tray):
++    client = gconf.client_get_default()
++    if client.get_bool('/desktop/sugar/feedback/enabled'):
++        tray.add_device(DeviceView())
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0051-Two-kinds-of-feedback-submits.patch b/rpms/sugar/0051-Two-kinds-of-feedback-submits.patch
new file mode 100644
index 0000000..db534ad
--- /dev/null
+++ b/rpms/sugar/0051-Two-kinds-of-feedback-submits.patch
@@ -0,0 +1,262 @@
+From 404e4581d8159b772cc236e095bd6767fd69d6b0 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Tue, 18 Jan 2011 07:53:44 +0000
+Subject: [PATCH sugar 51/74] Two kinds of feedback submits
+
+---
+ extensions/deviceicon/feedback.py |  214 +++++++++++++++++++++++--------------
+ 1 files changed, 132 insertions(+), 82 deletions(-)
+
+diff --git a/extensions/deviceicon/feedback.py b/extensions/deviceicon/feedback.py
+index dc40a6e..4f5198f 100644
+--- a/extensions/deviceicon/feedback.py
++++ b/extensions/deviceicon/feedback.py
+@@ -16,113 +16,163 @@
+ 
+ import logging
+ from gettext import gettext as _
++
+ import gconf
+ import gtk
++
++from sugar import profile
+ from sugar.graphics import style
++from sugar.graphics.icon import Icon
+ from sugar.graphics.tray import TrayIcon
+ from sugar.graphics.palette import Palette
+-from sugar.graphics.xocolor import XoColor
++from sugar.graphics.menuitem import MenuItem
++from sugar.graphics.toolbutton import ToolButton
++
+ from jarabe.model import feedback_collector
+-from jarabe.view import launcher
+-from sugar.activity import activityfactory
+-from jarabe.model import bundleregistry
+-from sugar.activity.activityhandle import ActivityHandle
++
+ 
+ _ICON_NAME = 'feedback-icon'
+ 
++
+ class DeviceView(TrayIcon):
++
+     FRAME_POSITION_RELATIVE = 500
++
+     def __init__(self):
+-        client = gconf.client_get_default()
+-        self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
+-        TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color)
++        TrayIcon.__init__(self, icon_name=_ICON_NAME,
++                xo_color=profile.get_color())
+         self.create_palette()
+-            
++
+     def create_palette(self):
+         logging.debug('palette created')
+-        self.palette = BugsPalette(_('Bugs'))
++        self.palette = _Palette(_('Feedback'))
+         self.palette.set_group_id('frame')
+         return self.palette
+ 
+ 
+-class BugsPalette(Palette):  
+-    
++class _Palette(Palette):
++
+     def __init__(self, primary_text):
+         Palette.__init__(self, primary_text)
+-        self._level = 0        
+-        self._status_label = gtk.Label()
+-        self._status_label.show()
+-        self.vbox = gtk.VBox()        
+-        self.hbox = gtk.HBox()              
+-        self.set_content(self.vbox)
+-        self._bugs_count_text = gtk.Label()
+-        self.vbox.pack_start(self._bugs_count_text,
+-         padding = style.DEFAULT_PADDING)                      
+-        self.vbox.pack_start(self.hbox, padding = style.DEFAULT_PADDING)
+-        self.vbox.show()        
+-        self.hbox.pack_start(self._status_label,
+-         padding = style.DEFAULT_PADDING)
+-        self.hbox.show()        
+-        self._open_log_button = gtk.Button("Open Log")
+-        self._open_log_button.connect("clicked",
+-         self.__open_log_activity)
+-        self.hbox.pack_start(self._open_log_button,
+-         padding = style.DEFAULT_PADDING)        
+-        self._send_report_button = gtk.Button("Send Report")
+-        self._send_report_button.connect("clicked", self.__send_bug_report)
+-        self.hbox.pack_start(self._send_report_button,
+-         padding = style.DEFAULT_PADDING)       
+-        self.__get_bug_count()
+-        self._bugs_count_text.show()
+-        self._open_log_button.show()
+-        self._send_report_button.show()        
+-    
++
++        icon = Icon()
++        icon.set_from_icon_name('emblem-favorite', gtk.ICON_SIZE_MENU)
++        icon.props.xo_color = profile.get_color()
++
++        personalized = MenuItem(_('Personalized submit...'))
++        personalized.set_image(icon)
++        personalized.connect('activate', self.__personalized_activate_cb)
++        personalized.show()
++        self.menu.append(personalized)
++
++        self._anonymous = MenuItem(_('Anonymous submit'), 'emblem-favorite')
++        self._anonymous.connect('activate', self.__anonymous_activate_cb)
++        self._anonymous.show()
++        self.menu.append(self._anonymous)
++
+     def popup(self, immediate=False, state=None):
++        self._anonymous.set_sensitive(not feedback_collector.is_empty())
+         Palette.popup(self, immediate=immediate, state=state)
+-        self.__update_bug_palette()
+-        
+-        
+-    def __send_bug_report(self, button):
+-        feedback_collector.submit()
+-        
+-    def __open_log_activity(self, path):
+-        
+-        registry = bundleregistry.get_registry()
+-        bundle = registry.get_bundle('org.laptop.Log')
+-        activity_id = activityfactory.create_activity_id()
+-        client = gconf.client_get_default()
+-        xo_color = XoColor(client.get_string('/desktop/sugar/user/color'))
+-        launcher.add_launcher(activity_id, bundle.get_icon(), xo_color)
+-        activityfactory.create(bundle, ActivityHandle(activity_id))
+-            
+-    def __get_bug_count(self):
+-        """This method returns the total error count"""
+-        bugs_count = 0
+-        
+-        
+-        return bugs_count
+-    
+-    def __update_bug_palette(self):        
+-        bugs_count = self.__get_bug_count()    
+-        self._open_log_button.set_sensitive(False)
+-        have_reports, have_errors = feedback_collector.stat()
+-        #have_reports, have_errors=[True,False]
+-        if have_errors:
+-            self._open_log_button.set_sensitive(True)
++
++    def __anonymous_activate_cb(self, button):
++        feedback_collector.anonymous_submit()
++
++    def __personalized_activate_cb(self, button):
++        window = _Window()
++        window.show()
++
++
++class _Window(gtk.Window):
++
++    __gtype_name__ = 'FeedbackWindow'
++
++    def __init__(self):
++        gtk.Window.__init__(self)
++
++        self.set_border_width(style.LINE_WIDTH)
++        offset = style.GRID_CELL_SIZE
++        width = gtk.gdk.screen_width() - offset * 2
++        height = gtk.gdk.screen_height() - offset * 2
++        self.set_size_request(width, height)
++        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
++        self.set_decorated(False)
++        self.set_resizable(False)
++        self.set_modal(True)
++
++        canvas = gtk.VBox()
++        self.add(canvas)
++
++        self._toolbar = gtk.Toolbar()
++        canvas.pack_start(self._toolbar, False)
++
++        icon = Icon()
++        icon.set_from_icon_name('emblem-favorite', gtk.ICON_SIZE_LARGE_TOOLBAR)
++        icon.props.xo_color = profile.get_color()
++        self._add_widget(icon)
++
++        self._add_separator(False)
++
++        title = gtk.Label(_('Submit feedback'))
++        self._add_widget(title)
++
++        self._add_separator(True)
++
++        submit = ToolButton('dialog-ok', tooltip=_('Submit'))
++        submit.connect('clicked', lambda button: self._submit())
++        self._toolbar.insert(submit, -1)
++
++        cancel = ToolButton('dialog-cancel', tooltip=_('Cancel'))
++        cancel.connect('clicked', lambda button: self.destroy())
++        self._toolbar.insert(cancel, -1)
++
++        bg = gtk.EventBox()
++        bg.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
++        canvas.pack_start(bg)
++
++        self._message = gtk.TextView()
++        scrolled = gtk.ScrolledWindow()
++        scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
++        scrolled.set_border_width(style.DEFAULT_PADDING)
++        scrolled.add(self._message)
++        bg.add(scrolled)
++
++        self.show_all()
++        self.set_focus(self._message)
++
++        self.connect("realize", self.__realize_cb)
++
++    def do_key_press_event(self, event):
++        if event.keyval == gtk.keysyms.Escape:
++            self.destroy()
++        elif event.keyval == gtk.keysyms.Return and \
++                event.state & gtk.gdk.CONTROL_MASK:
++            self._submit()
+         else:
+-            self._open_log_button.set_sensitive(False)
+-        
+-                
+-        if have_reports:
+-            self._send_report_button.set_sensitive(True)
++            gtk.Window.do_key_press_event(self, event)
++
++    def _add_widget(self, widget):
++        tool_item = gtk.ToolItem()
++        tool_item.add(widget)
++        self._toolbar.insert(tool_item, -1)
++
++    def _add_separator(self, expand):
++        separator = gtk.SeparatorToolItem()
++        separator.props.draw = False
++        if expand:
++            separator.set_expand(True)
+         else:
+-            self._send_report_button.set_sensitive(False)
+-                    
+-        if bugs_count == 0:        
+-            self._bugs_count_text.set_label('No Errors')
+-        else :            
+-            self._bugs_count_text.set_label(_('Total Errors: %d' %  bugs_count))
+- 
++            separator.set_size_request(style.DEFAULT_SPACING, -1)
++        self._toolbar.insert(separator, -1)
++
++    def _submit(self):
++        feedback_collector.submit(self._message.props.buffer.props.text)
++        self.destroy()
++
++    def __realize_cb(self, widget):
++        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
++        self.window.set_accept_focus(True)
++
++
+ def setup(tray):
+     client = gconf.client_get_default()
+     if client.get_bool('/desktop/sugar/feedback/enabled'):
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0052-Initial-client-implementation-for-feedback-feature.patch b/rpms/sugar/0052-Initial-client-implementation-for-feedback-feature.patch
new file mode 100644
index 0000000..0df6344
--- /dev/null
+++ b/rpms/sugar/0052-Initial-client-implementation-for-feedback-feature.patch
@@ -0,0 +1,384 @@
+From 8976c8e9cc399b83be1e28f7e4e958d93294af14 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Mon, 18 Jul 2011 20:29:49 +0200
+Subject: [PATCH sugar 52/74] Initial client implementation for feedback
+ feature
+
+See http://git.sugarlabs.org/feedback-server/ for the server side.
+
+[added link to server]
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ bin/sugar-session                      |    8 +-
+ data/sugar.schemas.in                  |   44 +++++++
+ src/jarabe/model/Makefile.am           |    1 +
+ src/jarabe/model/feedback_collector.py |  201 ++++++++++++++++++++++++++++++++
+ src/jarabe/model/shell.py              |   17 +++
+ src/jarabe/view/service.py             |    5 +
+ 6 files changed, 275 insertions(+), 1 deletions(-)
+ create mode 100644 src/jarabe/model/feedback_collector.py
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index a1d7cac..8e83d52 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -233,7 +233,7 @@ def main():
+     gettext.textdomain('sugar')
+ 
+     from jarabe.desktop import homewindow
+-    from jarabe.model import sound
++    from jarabe.model import sound, feedback_collector
+     from jarabe import intro
+ 
+     logger.start('shell')
+@@ -242,6 +242,12 @@ def main():
+     client.set_string('/apps/metacity/general/mouse_button_modifier',
+                       '<Super>')
+ 
++    if client.get_bool('/desktop/sugar/feedback/enabled'):
++        feedback_collector.start(
++                client.get_string('/desktop/sugar/feedback/server_host'),
++                client.get_int('/desktop/sugar/feedback/server_port'),
++                client.get_int('/desktop/sugar/feedback/auto_submit_delay'))
++
+     timezone = client.get_string('/desktop/sugar/date/timezone')
+     if timezone is not None and timezone:
+         os.environ['TZ'] = timezone
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 644678b..eecd1d8 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -2,6 +2,50 @@
+ <gconfschemafile>
+   <schemalist>
+     <schema>
++      <key>/schemas/desktop/sugar/feedback/enabled</key>
++      <applyto>/desktop/sugar/feedback/enabled</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Enable of disable feedback feature</short>
++        <long>Setting value to false will disable any feedback reports.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/feedback/server_host</key>
++      <applyto>/desktop/sugar/feedback/server_host</applyto>
++      <owner>sugar</owner>
++      <type>string</type>
++      <default>jita.sugarlabs.org</default>
++      <locale name="C">
++        <short>Server host to send reports to</short>
++        <long>Server that will handle reports sent via HTTPS POST requests.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/feedback/server_port</key>
++      <applyto>/desktop/sugar/feedback/server_port</applyto>
++      <owner>sugar</owner>
++      <type>int</type>
++      <default>8080</default>
++      <locale name="C">
++        <short>Server port to send reports to</short>
++        <long>TCP port that will used to send HTTPS POST requests.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/feedback/auto_submit_delay</key>
++      <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto>
++      <owner>sugar</owner>
++      <type>int</type>
++      <default>0</default>
++      <locale name="C">
++        <short>Delay in seconds to send anonymous reports automatically</short>
++        <long>Setting value to 0 will disable automatic submiting.</long>
++      </locale>
++    </schema>
++    <schema>
+       <key>/schemas/desktop/sugar/user/nick</key>
+       <applyto>/desktop/sugar/user/nick</applyto>
+       <owner>sugar</owner>
+diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
+index 040b099..04c4826 100644
+--- a/src/jarabe/model/Makefile.am
++++ b/src/jarabe/model/Makefile.am
+@@ -5,6 +5,7 @@ sugar_PYTHON =			\
+ 	accessibility.py	\
+ 	buddy.py		\
+ 	bundleregistry.py	\
++	feedback_collector.py	\
+ 	filetransfer.py		\
+ 	friends.py		\
+ 	invites.py		\
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+new file mode 100644
+index 0000000..5e92fbd
+--- /dev/null
++++ b/src/jarabe/model/feedback_collector.py
+@@ -0,0 +1,201 @@
++# Copyright (C) 2011, Aleksey Lim
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import os
++import time
++import httplib
++import logging
++import tarfile
++import threading
++from cStringIO import StringIO
++from os.path import join, exists, basename
++from email.mime.multipart import MIMEMultipart
++from email.mime.application import MIMEApplication
++from email.generator import Generator
++from email.encoders import encode_noop
++
++import gconf
++import gobject
++import simplejson
++
++from sugar import logger, feedback, util
++
++
++_reports = {}
++_logs = set()
++_host = None
++_port = None
++
++
++def start(host, port, auto_submit_delay):
++    global _host
++    global _port
++
++    _host = host
++    _port = port
++
++    if auto_submit_delay > 0:
++        gobject.timeout_add_seconds(auto_submit_delay, _submit)
++
++
++def update(bundle_id, report, log_file):
++    if bundle_id not in _reports:
++        _reports[bundle_id] = {}
++    stat = _reports[bundle_id]
++
++    for key, count in report.items():
++        if key not in stat:
++            stat[key] = 0
++        stat[key] += count
++
++    if log_file:
++        _logs.add(log_file)
++
++
++def is_empty():
++    report, shell_log = feedback.flush()
++    if report:
++        if shell_log:
++            shell_log = join(logger.get_logs_dir(), 'shell.log')
++        update('shell', report, shell_log)
++
++    return not _reports
++
++
++def submit(message):
++    from jarabe.journal import misc
++
++    client = gconf.client_get_default()
++    jabber = client.get_string('/desktop/sugar/collaboration/jabber_server')
++    nick = client.get_string("/desktop/sugar/user/nick")
++
++    data = {'message': message,
++            'serial_number': '',
++            'nick': '',
++            'jabber_server': jabber,
++            }
++    _submit(data)
++
++
++def anonymous_submit():
++    _submit()
++
++
++def _submit(data=None):
++    if data:
++        _reports.update(data)
++    if is_empty():
++        return True
++
++    logging.debug('Sending feedback report: %r', _reports)
++
++    report = simplejson.dumps(_reports)
++    _reports.clear()
++
++    tar_file = util.TempFilePath()
++    tar = tarfile.open(tar_file, 'w:gz')
++
++    while _logs:
++        log_file = _logs.pop()
++        if exists(log_file):
++            tar.add(log_file, arcname=basename(log_file))
++
++    report_file = tarfile.TarInfo('report')
++    report_file.mode = 0644
++    report_file.mtime = int(time.time())
++    report_file.size = len(report)
++    tar.addfile(report_file, StringIO(report))
++
++    tar.close()
++
++    _SubmitThread(tar_file).run()
++
++    return True
++
++
++class _SubmitThread(threading.Thread):
++
++    def __init__(self, tar_file):
++        threading.Thread.__init__(self)
++        self._tar_file = tar_file
++
++    def run(self):
++        try:
++            message = _FormData()
++            attachment = MIMEApplication(file(self._tar_file).read(),
++                    _encoder=encode_noop)
++            message.attach_file(attachment,
++                    name='report', filename='report.tar.gz')
++            body, headers = message.get_request_data()
++
++            conn = httplib.HTTPSConnection(_host, _port)
++            conn.request('POST', '/', body, headers)
++            response = conn.getresponse()
++
++            if response.status != 200:
++                logging.error('Incorrect feedback submit: %s, %s',
++                        response.status, response.read())
++
++        except Exception:
++            logging.exception('Cannot submit feedback')
++        finally:
++            os.unlink(self._tar_file)
++            self._tar_file = None
++
++
++class _FormData(MIMEMultipart):
++    '''A simple RFC2388 multipart/form-data implementation.
++
++    A snippet from http://bugs.python.org/issue3244
++
++    '''
++
++    def __init__(self, boundary=None, _subparts=None, **kwargs):
++        MIMEMultipart.__init__(self, _subtype='form-data',
++                boundary=boundary, _subparts=_subparts, **kwargs)
++
++    def attach(self, subpart):
++        if 'MIME-Version' in subpart:
++            if subpart['MIME-Version'] != self['MIME-Version']:
++                raise ValueError('subpart has incompatible MIME-Version')
++            # Note: This isn't strictly necessary, but there is no point in
++            # including a MIME-Version header in each subpart.
++            del subpart['MIME-Version']
++        MIMEMultipart.attach(self, subpart)
++
++    def attach_file(self, subpart, name, filename):
++        '''
++        Attach a subpart, setting it's Content-Disposition header to "file".
++        '''
++        name = name.replace('"', '\\"')
++        filename = filename.replace('"', '\\"')
++        subpart['Content-Disposition'] = \
++                'form-data; name="%s"; filename="%s"' % (name, filename)
++        self.attach(subpart)
++
++    def get_request_data(self, trailing_newline=True):
++        '''Return the encoded message body.'''
++        f = StringIO()
++        generator = Generator(f, mangle_from_=False)
++        # pylint: disable-msg=W0212
++        generator._dispatch(self)
++        # HTTP needs a trailing newline.  Since our return value is likely to
++        # be passed directly to an HTTP connection, we might as well add it
++        # here.
++        if trailing_newline:
++            f.write('\n')
++        body = f.getvalue()
++        headers = dict(self)
++        return body, headers
+diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
+index 31605f7..1f980cf 100644
+--- a/src/jarabe/model/shell.py
++++ b/src/jarabe/model/shell.py
+@@ -23,12 +23,15 @@
+ import gobject
+ import gtk
+ import dbus
++import simplejson
+ 
+ from sugar import wm
+ from sugar import dispatch
+ from sugar.graphics.xocolor import XoColor
+ 
+ from jarabe.model.bundleregistry import get_registry
++from jarabe.model import feedback_collector
++
+ 
+ _SERVICE_NAME = 'org.laptop.Activity'
+ _SERVICE_PATH = '/org/laptop/Activity'
+@@ -234,6 +237,12 @@ def get_bundle_path(self):
+         else:
+             return self._activity_info.get_path()
+ 
++    def get_bundle_id(self):
++        if self._activity_info is None:
++            return None
++        else:
++            return self._activity_info.get_bundle_id()
++
+     def get_activity_name(self):
+         """Returns the activity's bundle name"""
+         if self._activity_info is None:
+@@ -654,6 +663,14 @@ def notify_launch_failed(self, activity_id):
+             logging.error('Model for activity id %s does not exist.',
+                 activity_id)
+ 
++    def notify_feedback(self, activity_id, report, log_file):
++        home_activity = self.get_activity_by_id(activity_id)
++        if home_activity is not None:
++            feedback_collector.update(home_activity.get_bundle_id(),
++                    simplejson.loads(report), log_file)
++        else:
++            logging.error('No %s activity for sending feedback', activity_id)
++
+     def _check_activity_launched(self, activity_id):
+         home_activity = self.get_activity_by_id(activity_id)
+ 
+diff --git a/src/jarabe/view/service.py b/src/jarabe/view/service.py
+index 29e46b2..0f5e94f 100644
+--- a/src/jarabe/view/service.py
++++ b/src/jarabe/view/service.py
+@@ -88,3 +88,8 @@ def NotifyLaunch(self, bundle_id, activity_id):
+                          in_signature='s', out_signature='')
+     def NotifyLaunchFailure(self, activity_id):
+         shell.get_model().notify_launch_failed(activity_id)
++
++    @dbus.service.method(_DBUS_SHELL_IFACE,
++                         in_signature='sss', out_signature='')
++    def Feedback(self, activity_id, report, log_file):
++        shell.get_model().notify_feedback(activity_id, report, log_file)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0053-Message-Notifications-second-behaviour-enhancement.patch b/rpms/sugar/0053-Message-Notifications-second-behaviour-enhancement.patch
new file mode 100644
index 0000000..0b58b4e
--- /dev/null
+++ b/rpms/sugar/0053-Message-Notifications-second-behaviour-enhancement.patch
@@ -0,0 +1,31 @@
+From 341719f37739f31400f8eb4afb803125b0df5a8a Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Tue, 11 Jan 2011 19:49:39 +0000
+Subject: [PATCH sugar 53/74] Message Notifications second behaviour
+ enhancement
+
+Corner notification icon will only show up if the frame is not
+visible.
+---
+ src/jarabe/frame/frame.py |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
+index 6a9735b..cd1dc20 100644
+--- a/src/jarabe/frame/frame.py
++++ b/src/jarabe/frame/frame.py
+@@ -396,8 +396,10 @@ def add_message(self, body, summary='', icon_name=_DEFAULT_ICON,
+         button.start_pulsing()
+ 
+         palette.push_message(body, summary, icon_name, xo_color)
+-        self._launch_notification_icon(_DEFAULT_ICON, xo_color, corner, duration)
+ 
++        if not self.visible:
++            self._launch_notification_icon(_DEFAULT_ICON, xo_color,
++                                            corner, duration)
+ 
+     def remove_message(self, palette, corner):
+         if corner not in self._notif_by_message:
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0054-Enable-disable-personalized-and-anonymous-feedback-s.patch b/rpms/sugar/0054-Enable-disable-personalized-and-anonymous-feedback-s.patch
new file mode 100644
index 0000000..9c811ea
--- /dev/null
+++ b/rpms/sugar/0054-Enable-disable-personalized-and-anonymous-feedback-s.patch
@@ -0,0 +1,97 @@
+From 9e9f27c8398e5210e63d918d700f9c00f741111e Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Fri, 4 Feb 2011 01:29:28 +0000
+Subject: [PATCH sugar 54/74] Enable/disable personalized and anonymous
+ feedback submits unrelated
+
+---
+ bin/sugar-session                 |    5 +++--
+ data/sugar.schemas.in             |   30 +++++++++++++++---------------
+ extensions/deviceicon/feedback.py |    2 +-
+ 3 files changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index 8e83d52..ee0048d 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -242,11 +242,12 @@ def main():
+     client.set_string('/apps/metacity/general/mouse_button_modifier',
+                       '<Super>')
+ 
+-    if client.get_bool('/desktop/sugar/feedback/enabled'):
++    if client.get_bool('/desktop/sugar/feedback/personalized_submit') or \
++            client.get_int('/desktop/sugar/feedback/anonymous_delay'):
+         feedback_collector.start(
+                 client.get_string('/desktop/sugar/feedback/server_host'),
+                 client.get_int('/desktop/sugar/feedback/server_port'),
+-                client.get_int('/desktop/sugar/feedback/auto_submit_delay'))
++                client.get_int('/desktop/sugar/feedback/anonymous_delay'))
+ 
+     timezone = client.get_string('/desktop/sugar/date/timezone')
+     if timezone is not None and timezone:
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index eecd1d8..637422e 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -2,14 +2,25 @@
+ <gconfschemafile>
+   <schemalist>
+     <schema>
+-      <key>/schemas/desktop/sugar/feedback/enabled</key>
+-      <applyto>/desktop/sugar/feedback/enabled</applyto>
++      <key>/schemas/desktop/sugar/feedback/personalized_submit</key>
++      <applyto>/desktop/sugar/feedback/personalized_submit</applyto>
+       <owner>sugar</owner>
+       <type>bool</type>
+       <default>true</default>
+       <locale name="C">
+-        <short>Enable of disable feedback feature</short>
+-        <long>Setting value to false will disable any feedback reports.</long>
++        <short>Enable personalized submit</short>
++        <long>Show device icon to let pople submit text message with all collected data including detialed information about sumbitter.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/feedback/anonymous_delay</key>
++      <applyto>/desktop/sugar/feedback/anonymous_delay</applyto>
++      <owner>sugar</owner>
++      <type>int</type>
++      <default>0</default>
++      <locale name="C">
++        <short>Delay in seconds to send anonymous reports automatically</short>
++        <long>Submit will not contain any information about submiter, only anonymous data (but see anonymous_with_sn). Setting value to 0 will disable automatic submiting.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -35,17 +46,6 @@
+       </locale>
+     </schema>
+     <schema>
+-      <key>/schemas/desktop/sugar/feedback/auto_submit_delay</key>
+-      <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto>
+-      <owner>sugar</owner>
+-      <type>int</type>
+-      <default>0</default>
+-      <locale name="C">
+-        <short>Delay in seconds to send anonymous reports automatically</short>
+-        <long>Setting value to 0 will disable automatic submiting.</long>
+-      </locale>
+-    </schema>
+-    <schema>
+       <key>/schemas/desktop/sugar/user/nick</key>
+       <applyto>/desktop/sugar/user/nick</applyto>
+       <owner>sugar</owner>
+diff --git a/extensions/deviceicon/feedback.py b/extensions/deviceicon/feedback.py
+index 4f5198f..49db09b 100644
+--- a/extensions/deviceicon/feedback.py
++++ b/extensions/deviceicon/feedback.py
+@@ -175,5 +175,5 @@ def __realize_cb(self, widget):
+ 
+ def setup(tray):
+     client = gconf.client_get_default()
+-    if client.get_bool('/desktop/sugar/feedback/enabled'):
++    if client.get_bool('/desktop/sugar/feedback/personalized_submit'):
+         tray.add_device(DeviceView())
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0055-Send-XO-serial-numbers-with-anonymous-reports.patch b/rpms/sugar/0055-Send-XO-serial-numbers-with-anonymous-reports.patch
new file mode 100644
index 0000000..fef05e3
--- /dev/null
+++ b/rpms/sugar/0055-Send-XO-serial-numbers-with-anonymous-reports.patch
@@ -0,0 +1,63 @@
+From 6b5f89da40f0d71bec2995ac72d0041ea7d7b0fe Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Fri, 4 Feb 2011 01:29:29 +0000
+Subject: [PATCH sugar 55/74] Send XO serial numbers with anonymous reports
+
+---
+ data/sugar.schemas.in                  |   11 +++++++++++
+ src/jarabe/model/feedback_collector.py |   10 ++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 637422e..fb18d19 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -24,6 +24,17 @@
+       </locale>
+     </schema>
+     <schema>
++      <key>/schemas/desktop/sugar/feedback/anonymous_with_sn</key>
++      <applyto>/desktop/sugar/feedback/anonymous_with_sn</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Add XO serial numbers to anonymous submits</short>
++        <long>Add XO serial numbers to anonymous submits.</long>
++      </locale>
++    </schema>
++    <schema>
+       <key>/schemas/desktop/sugar/feedback/server_host</key>
+       <applyto>/desktop/sugar/feedback/server_host</applyto>
+       <owner>sugar</owner>
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index 5e92fbd..93fa704 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -47,7 +47,7 @@ def start(host, port, auto_submit_delay):
+     _port = port
+ 
+     if auto_submit_delay > 0:
+-        gobject.timeout_add_seconds(auto_submit_delay, _submit)
++        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit)
+ 
+ 
+ def update(bundle_id, report, log_file):
+@@ -90,7 +90,13 @@ def submit(message):
+ 
+ 
+ def anonymous_submit():
+-    _submit()
++    from jarabe.journal import misc
++
++    data = {}
++    client = gconf.client_get_default()
++    if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'):
++        data['serial_number'] = misc.get_xo_serial()
++    _submit(data)
+ 
+ 
+ def _submit(data=None):
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0056-Let-call-the-frame-from-arbitrary-code-avoiding-curc.patch b/rpms/sugar/0056-Let-call-the-frame-from-arbitrary-code-avoiding-curc.patch
new file mode 100644
index 0000000..70d9b3e
--- /dev/null
+++ b/rpms/sugar/0056-Let-call-the-frame-from-arbitrary-code-avoiding-curc.patch
@@ -0,0 +1,32 @@
+From 9640640f44486b325027b79be2117dab5472f496 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@member.fsf.org>
+Date: Wed, 12 Jan 2011 19:32:31 +0000
+Subject: [PATCH sugar 56/74] Let call the frame from arbitrary code avoiding
+ curcular imports
+
+---
+ src/jarabe/frame/__init__.py |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/src/jarabe/frame/__init__.py b/src/jarabe/frame/__init__.py
+index b3e4b80..a047b91 100644
+--- a/src/jarabe/frame/__init__.py
++++ b/src/jarabe/frame/__init__.py
+@@ -14,13 +14,11 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-from jarabe.frame.frame import Frame
+-
+-
+ _view = None
+ 
+ 
+ def get_view():
++    from jarabe.frame.frame import Frame
+     global _view
+     if not _view:
+         _view = Frame()
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0057-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto.patch b/rpms/sugar/0057-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto.patch
new file mode 100644
index 0000000..c40fa82
--- /dev/null
+++ b/rpms/sugar/0057-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto.patch
@@ -0,0 +1,112 @@
+From 15fd367960ee975ed58174702cd74a2d7d66396e Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@activitycentral.org>
+Date: Sun, 6 Feb 2011 15:52:50 +0000
+Subject: [PATCH sugar 57/74] Notify on not sent feedbacks; fix issue with not
+ auto resend
+
+---
+ src/jarabe/model/feedback_collector.py |   32 ++++++++++++++++++++------------
+ 1 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index 93fa704..e239c9a 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -25,12 +25,14 @@
+ from email.mime.application import MIMEApplication
+ from email.generator import Generator
+ from email.encoders import encode_noop
++from gettext import gettext as _
+ 
+ import gconf
+ import gobject
+ import simplejson
+ 
+ from sugar import logger, feedback, util
++from jarabe import frame
+ 
+ 
+ _reports = {}
+@@ -47,7 +49,7 @@ def start(host, port, auto_submit_delay):
+     _port = port
+ 
+     if auto_submit_delay > 0:
+-        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit)
++        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit, True)
+ 
+ 
+ def update(bundle_id, report, log_file):
+@@ -86,24 +88,26 @@ def submit(message):
+             'nick': '',
+             'jabber_server': jabber,
+             }
+-    _submit(data)
++    _submit(data, False)
+ 
+ 
+-def anonymous_submit():
++def anonymous_submit(implicit=False):
+     from jarabe.journal import misc
+ 
+     data = {}
+     client = gconf.client_get_default()
+     if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'):
+         data['serial_number'] = misc.get_xo_serial()
+-    _submit(data)
++    _submit(data, implicit)
++
++    return True
+ 
+ 
+-def _submit(data=None):
++def _submit(data, implicit):
+     if data:
+         _reports.update(data)
+     if is_empty():
+-        return True
++        return
+ 
+     logging.debug('Sending feedback report: %r', _reports)
+ 
+@@ -126,16 +130,15 @@ def _submit(data=None):
+ 
+     tar.close()
+ 
+-    _SubmitThread(tar_file).run()
+-
+-    return True
++    _SubmitThread(tar_file, implicit).run()
+ 
+ 
+ class _SubmitThread(threading.Thread):
+ 
+-    def __init__(self, tar_file):
++    def __init__(self, tar_file, implicit):
+         threading.Thread.__init__(self)
+         self._tar_file = tar_file
++        self._implicit = implicit
+ 
+     def run(self):
+         try:
+@@ -151,11 +154,16 @@ def run(self):
+             response = conn.getresponse()
+ 
+             if response.status != 200:
+-                logging.error('Incorrect feedback submit: %s, %s',
++                raise Exception('Incorrect feedback submit: %s, %s',
+                         response.status, response.read())
+ 
+         except Exception:
+-            logging.exception('Cannot submit feedback')
++            title = _('Cannot submit feedback')
++            msg = _('Feedback was not sent to %s:%s.') % (_host, _port)
++            if not self._implicit:
++                gobject.idle_add(lambda:
++                        frame.get_view().add_message(summary=title, body=msg))
++            logging.exception('%s: %s', title, msg)
+         finally:
+             os.unlink(self._tar_file)
+             self._tar_file = None
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0058-Switch-default-feedback-serve-to-feedback.sl.o-clean.patch b/rpms/sugar/0058-Switch-default-feedback-serve-to-feedback.sl.o-clean.patch
new file mode 100644
index 0000000..7f8d518
--- /dev/null
+++ b/rpms/sugar/0058-Switch-default-feedback-serve-to-feedback.sl.o-clean.patch
@@ -0,0 +1,44 @@
+From 0c5badda0f28f9f75a2d1316c24649e50a623711 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@activitycentral.org>
+Date: Sat, 12 Feb 2011 06:56:55 +0000
+Subject: [PATCH sugar 58/74] Switch default feedback serve to feedback.sl.o;
+ clean up gconf doc strings
+
+---
+ data/sugar.schemas.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index fb18d19..6c0d70b 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -9,7 +9,7 @@
+       <default>true</default>
+       <locale name="C">
+         <short>Enable personalized submit</short>
+-        <long>Show device icon to let pople submit text message with all collected data including detialed information about sumbitter.</long>
++        <long>Show device icon to let poeple submit text messages with all collected data including detialed information about sumbitter.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -31,7 +31,7 @@
+       <default>false</default>
+       <locale name="C">
+         <short>Add XO serial numbers to anonymous submits</short>
+-        <long>Add XO serial numbers to anonymous submits.</long>
++        <long>Actually, setting this value to true will make anonymous sebmits not anonymous for XO laptops. Might be useful for Sugar deployments.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -39,7 +39,7 @@
+       <applyto>/desktop/sugar/feedback/server_host</applyto>
+       <owner>sugar</owner>
+       <type>string</type>
+-      <default>jita.sugarlabs.org</default>
++      <default>feedback.sugarlabs.org</default>
+       <locale name="C">
+         <short>Server host to send reports to</short>
+         <long>Server that will handle reports sent via HTTPS POST requests.</long>
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch b/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch
new file mode 100644
index 0000000..6e29242
--- /dev/null
+++ b/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch
@@ -0,0 +1,66 @@
+From 2ef6c6d0fc0cf10698a28880b89208b85f0b32e7 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@activitycentral.org>
+Date: Sat, 12 Feb 2011 07:17:17 +0000
+Subject: [PATCH sugar 59/74] Do not send empty feedback reports if
+ anonymous_with_sn is enabled
+
+---
+ src/jarabe/model/feedback_collector.py |   24 +++++++++++++-----------
+ 1 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index e239c9a..95dc4ee 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -49,7 +49,8 @@ def start(host, port, auto_submit_delay):
+     _port = port
+ 
+     if auto_submit_delay > 0:
+-        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit, True)
++        logging.debug('Feedback auto submit with %ss delay', auto_submit_delay)
++        gobject.timeout_add_seconds(auto_submit_delay, _auto_submit_cb)
+ 
+ 
+ def update(bundle_id, report, log_file):
+@@ -88,27 +89,28 @@ def submit(message):
+             'nick': '',
+             'jabber_server': jabber,
+             }
+-    _submit(data, False)
++    _reports.update(data)
++    _submit(False)
+ 
+ 
+ def anonymous_submit(implicit=False):
++    if is_empty():
++        return
++
+     from jarabe.journal import misc
+ 
+-    data = {}
+     client = gconf.client_get_default()
+     if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'):
+-        data['serial_number'] = misc.get_xo_serial()
+-    _submit(data, implicit)
++        _reports['serial_number'] = misc.get_xo_serial()
++    _submit(implicit)
+ 
+-    return True
+ 
++def _auto_submit_cb():
++    anonymous_submit()
++    return True
+ 
+-def _submit(data, implicit):
+-    if data:
+-        _reports.update(data)
+-    if is_empty():
+-        return
+ 
++def _submit(implicit):
+     logging.debug('Sending feedback report: %r', _reports)
+ 
+     report = simplejson.dumps(_reports)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0060-Replace-activity-updater-with-microformat-compatible.patch b/rpms/sugar/0060-Replace-activity-updater-with-microformat-compatible.patch
new file mode 100644
index 0000000..3cb7872
--- /dev/null
+++ b/rpms/sugar/0060-Replace-activity-updater-with-microformat-compatible.patch
@@ -0,0 +1,626 @@
+From 15aa8fb2be53a1950f15d1a4ae630967a82319b9 Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@sugarlabs.org>
+Date: Mon, 10 Jan 2011 22:36:03 -0300
+Subject: [PATCH sugar 60/74] Replace activity updater with microformat
+ compatible one
+
+This patch replaces the Sugar activity updater with one, that supports
+activity microformats.
+
++ The updater now allows installation of new activities which were not
+previously installed.
+
++ The updater uses the optional olpc-activity-name and
+olpc-activity-size
+tags.
+
+   - If olpc-activity-name is not present, the activity name is derived
+     from the bundle id. For example, org.Sugarlabs.RecordActivity
+     will be listed as Record.
+
+   - If olpc-activity-size is not present, an additional
+     http request is made to ascertain the size of the
+     bundle.
+
++ If the size returned as zero, the bundle is removed from the list of
+ those which may be updated.
+
++ To install new bundles, a metabundle class has been created, which
+acts as an empty structure.
+
+Co-Authored by Anish Mangal <anish@sugarlabs.org>
+Co-Authored by Akash Gangil <akashg1611@gmail.com>
+
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+---
+ data/sugar.schemas.in                              |   12 ++
+ extensions/cpsection/updater/backends/Makefile.am  |    2 +-
+ extensions/cpsection/updater/backends/aslo.py      |  164 ----------------
+ .../cpsection/updater/backends/microformat.py      |  203 ++++++++++++++++++++
+ extensions/cpsection/updater/model.py              |   87 ++++++---
+ extensions/cpsection/updater/view.py               |   18 ++-
+ 6 files changed, 285 insertions(+), 201 deletions(-)
+ delete mode 100644 extensions/cpsection/updater/backends/aslo.py
+ create mode 100644 extensions/cpsection/updater/backends/microformat.py
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 6c0d70b..4c17ff0 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -117,6 +117,18 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/desktop/sugar/updater_url</key>
++      <applyto>/desktop/sugar/updater_url</applyto>
++      <owner>sugar</owner>
++      <type>string</type>
++      <default>http://activities-testing.sugarlabs.org/services/micro-format.php?collection_nickname=fructose</default>
++      <locale name="C">
++        <short>Activity updater URL.</short>
++        <long>This key contains the url which the microformat compatible activity updater will search for activity updates.</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/desktop/sugar/backup_url</key>
+       <applyto>/desktop/sugar/backup_url</applyto>
+       <owner>sugar</owner>
+diff --git a/extensions/cpsection/updater/backends/Makefile.am b/extensions/cpsection/updater/backends/Makefile.am
+index e280a07..e9c1284 100644
+--- a/extensions/cpsection/updater/backends/Makefile.am
++++ b/extensions/cpsection/updater/backends/Makefile.am
+@@ -1,5 +1,5 @@
+ sugardir = $(pkgdatadir)/extensions/cpsection/updater/backends
+ 
+ sugar_PYTHON = 		\
+-	aslo.py		\
++	microformat.py	\
+ 	__init__.py
+diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py
+deleted file mode 100644
+index 6504e9e..0000000
+--- a/extensions/cpsection/updater/backends/aslo.py
++++ /dev/null
+@@ -1,164 +0,0 @@
+-#!/usr/bin/python
+-# Copyright (C) 2009, Sugar Labs
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+-
+-"""Activity information microformat parser.
+-
+-Activity information is embedded in HTML/XHTML/XML pages using a
+-Resource Description Framework (RDF) http://www.w3.org/RDF/ .
+-
+-An example::
+-
+-<?xml version="1.0" encoding="UTF-8"?>
+-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+-        xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+-<RDF:Description about="urn:mozilla:extension:bounce">
+-    <em:updates>
+-        <RDF:Seq>
+-            <RDF:li resource="urn:mozilla:extension:bounce:7"/>
+-        </RDF:Seq>
+-    </em:updates>
+-</RDF:Description>
+-
+-<RDF:Description about="urn:mozilla:extension:bounce:7">
+-    <em:version>7</em:version>
+-    <em:targetApplication>
+-        <RDF:Description>
+-            <em:id>{3ca105e0-2280-4897-99a0-c277d1b733d2}</em:id>
+-            <em:minVersion>0.82</em:minVersion>
+-            <em:maxVersion>0.84</em:maxVersion>
+-            <em:updateLink>http://foo.xo</em:updateLink>
+-            <em:updateSize>7</em:updateSize>
+-            <em:updateHash>sha256:816a7c43b4f1ea4769c61c03ea4..</em:updateHash>
+-        </RDF:Description>
+-    </em:targetApplication>
+-</RDF:Description></RDF:RDF>
+-"""
+-
+-import logging
+-from xml.etree.ElementTree import XML
+-import traceback
+-
+-import gio
+-
+-from sugar.bundle.bundleversion import NormalizedVersion
+-from sugar.bundle.bundleversion import InvalidVersionError
+-
+-from jarabe import config
+-
+-_FIND_DESCRIPTION = \
+-        './/{http://www.w3.org/1999/02/22-rdf-syntax-ns#}Description'
+-_FIND_VERSION = './/{http://www.mozilla.org/2004/em-rdf#}version'
+-_FIND_LINK = './/{http://www.mozilla.org/2004/em-rdf#}updateLink'
+-_FIND_SIZE = './/{http://www.mozilla.org/2004/em-rdf#}updateSize'
+-
+-_UPDATE_PATH = 'http://activities.sugarlabs.org/services/update-aslo.php'
+-
+-_fetcher = None
+-
+-
+-class _UpdateFetcher(object):
+-
+-    _CHUNK_SIZE = 10240
+-
+-    def __init__(self, bundle, completion_cb):
+-        # ASLO knows only about stable SP releases
+-        major, minor = config.version.split('.')[0:2]
+-        sp_version = '%s.%s' % (major, int(minor) + int(minor) % 2)
+-
+-        url = '%s?id=%s&appVersion=%s' % \
+-                (_UPDATE_PATH, bundle.get_bundle_id(), sp_version)
+-
+-        logging.debug('Fetch %s', url)
+-
+-        self._completion_cb = completion_cb
+-        self._file = gio.File(url)
+-        self._stream = None
+-        self._xml_data = ''
+-        self._bundle = bundle
+-
+-        self._file.read_async(self.__file_read_async_cb)
+-
+-    def __file_read_async_cb(self, gfile, result):
+-        try:
+-            self._stream = self._file.read_finish(result)
+-        except:
+-            global _fetcher
+-            _fetcher = None
+-            self._completion_cb(None, None, None, None, traceback.format_exc())
+-            return
+-
+-        self._stream.read_async(self._CHUNK_SIZE, self.__stream_read_async_cb)
+-
+-    def __stream_read_async_cb(self, stream, result):
+-        xml_data = self._stream.read_finish(result)
+-        if xml_data is None:
+-            global _fetcher
+-            _fetcher = None
+-            self._completion_cb(self._bundle, None, None, None,
+-                    'Error reading update information for %s from '
+-                    'server.' % self._bundle.get_bundle_id())
+-            return
+-        elif not xml_data:
+-            self._process_result()
+-        else:
+-            self._xml_data += xml_data
+-            self._stream.read_async(self._CHUNK_SIZE,
+-                                    self.__stream_read_async_cb)
+-
+-    def _process_result(self):
+-        document = XML(self._xml_data)
+-
+-        if document.find(_FIND_DESCRIPTION) is None:
+-            logging.debug('Bundle %s not available in the server for the '
+-                'version %s', self._bundle.get_bundle_id(), config.version)
+-            version = None
+-            link = None
+-            size = None
+-        else:
+-            try:
+-                version = NormalizedVersion(document.find(_FIND_VERSION).text)
+-            except InvalidVersionError:
+-                logging.exception('Exception occured while parsing version')
+-                version = '0'
+-
+-            link = document.find(_FIND_LINK).text
+-
+-            try:
+-                size = long(document.find(_FIND_SIZE).text) * 1024
+-            except ValueError:
+-                logging.exception('Exception occured while parsing size')
+-                size = 0
+-
+-        global _fetcher
+-        _fetcher = None
+-        self._completion_cb(self._bundle, version, link, size, None)
+-
+-
+-def fetch_update_info(bundle, completion_cb):
+-    """Queries the server for a newer version of the ActivityBundle.
+-
+-       completion_cb receives bundle, version, link, size and possibly an error
+-       message:
+-
+-       def completion_cb(bundle, version, link, size, error_message):
+-    """
+-    global _fetcher
+-
+-    if _fetcher is not None:
+-        raise RuntimeError('Multiple simultaneous requests are not supported')
+-
+-    _fetcher = _UpdateFetcher(bundle, completion_cb)
+diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py
+new file mode 100644
+index 0000000..97499aa
+--- /dev/null
++++ b/extensions/cpsection/updater/backends/microformat.py
+@@ -0,0 +1,203 @@
++#!/usr/bin/python
++#
++# Copyright (C) 2011, Anish Mangal <anish@sugarlabs.org>
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++
++import logging
++from HTMLParser import HTMLParser
++import urllib
++import re
++
++import gio
++import gobject
++import gconf
++
++from jarabe import config
++
++client = gconf.client_get_default()
++_UPDATE_PATH = client.get_string('/desktop/sugar/updater_url')
++_ACTIVITIES_LIST = {}
++ACTION_CHECKING = 0
++ACTION_UPDATING = 1
++ACTION_DOWNLOADING = 2
++
++class MicroformatParser(HTMLParser):
++
++    def __init__(self, data, completion_cb):
++        HTMLParser.__init__(self)
++        self.reset()
++        self._data_to_parse = data
++        self._activity_id = ''
++        self._activity_url = ''
++        self._activity_version = ''
++        self._activity_size = 1
++        self._activity_name = ''
++        self._inside_activity_block = False
++        self._inside_activity_version = False
++        self._inside_activity_id = False
++        self._inside_activity_url = False
++        self._inside_activity_size = False
++        self._inside_activity_name = False
++        self._activity_block_tag = ''
++        self._completion_cb = completion_cb
++
++    def parse(self):
++        self.feed(self._data_to_parse)
++
++    def handle_endtag(self, tag):
++        if tag == self._activity_block_tag and self._inside_activity_block:
++            self._inside_activity_block = False
++
++            _ACTIVITIES_LIST[self._activity_id] = \
++                    {'version':self._activity_version,
++                            'url':self._activity_url,
++                            'size':self._activity_size,
++                            'name':self._activity_name}
++
++        elif tag == 'a':
++            if self._inside_activity_url:
++                self._inside_activity_url = False
++
++        elif tag == 'body':
++            num_bundles = len(_ACTIVITIES_LIST)
++            progress = num_bundles
++            for bundle, info in _ACTIVITIES_LIST.items():
++                progress = progress + 1
++                if _ACTIVITIES_LIST[bundle]['size'] == 1:
++                    try:
++                        _ACTIVITIES_LIST[bundle]['size'] = \
++                            gio.File(_ACTIVITIES_LIST[bundle]['url']).\
++                            query_info('*').get_size()
++
++                    except Exception, e:
++                        logging.exception(e)
++
++                    if _ACTIVITIES_LIST[bundle]['size'] == 0:
++                        logging.error('Size of activity %s reported as '
++                                '0 bytes. Excluding from update list' % bundle)
++                        del _ACTIVITIES_LIST[bundle]
++
++                    elif _ACTIVITIES_LIST[bundle]['name'] == '':
++                        # Do some regex magic to get the 'probable'
++                        # activity name.
++                        activity_name = re.split('\.',
++                                bundle)[-1]
++                        activity_name = re.sub('^[\s|\t]*', '',
++                                activity_name)
++                        activity_name = re.sub('[\s|\t]*$', '',
++                                activity_name)
++                        activity_name = re.sub('[A|a]ctivity$', '',
++                                activity_name)
++                        _ACTIVITIES_LIST[bundle]['name'] = \
++                                activity_name
++
++            self._completion_cb(_ACTIVITIES_LIST, None)
++
++    def handle_starttag(self, tag, attrs):
++        for attribute, value in attrs:
++            if value == 'olpc-activity-info':
++                self._inside_activity_block = True
++                self._activity_block_tag = tag
++
++        if tag == 'span':
++            for attribute, value in attrs:
++                if value == 'olpc-activity-id':
++                    self._inside_activity_id = True
++                elif value == 'olpc-activity-version':
++                    self._inside_activity_version = True
++                elif value == 'olpc-activity-name':
++                    self._inside_activity_name = True
++                elif value == 'olpc-activity-size':
++                    self._inside_activity_size = True
++                elif value == 'olpc-activity-url':
++                    self._inside_activity_url = True
++
++        elif tag == 'a':
++            if self._inside_activity_url:
++                for attribute, value in attrs:
++                    if attribute == 'href':
++                        self._activity_url = value
++
++    def handle_data(self, data):
++        if self._inside_activity_version:
++            self._activity_version = int(data)
++            self._inside_activity_version = False
++
++        elif self._inside_activity_id:
++            self._activity_id = data
++            self._inside_activity_id = False
++
++        elif self._inside_activity_name:
++            self._activity_name = data
++            self._inside_activity_name = False
++
++        elif self._inside_activity_size:
++            self._activity_size = int(data)
++            self._inside_activity_size = False
++
++class _UpdateFetcher(gobject.GObject):
++
++    __gsignals__ = {
++        'progress': (gobject.SIGNAL_RUN_FIRST,
++                     gobject.TYPE_NONE,
++                     ([int, str, float, int])),
++    }
++
++    def __init__(self, completion_cb):
++        gobject.GObject.__init__(self)
++        # ASLO knows only about stable SP releases
++        major, minor = config.version.split('.')[0:2]
++        sp_version = '%s.%s' % (major, int(minor) + int(minor) % 2)
++        self._data = ''
++        self._completion_cb = completion_cb
++
++    def download_bundle_updates(self):
++        self.emit('progress', ACTION_CHECKING, 'Fetching update '
++                'information', 1, 3)
++        self._url = _UPDATE_PATH
++        self._file = gio.File(self._url)
++        logging.debug('Fetch %s', self._url)
++        self._file.read_async(self.__read_async_cb)
++
++    def __read_async_cb(self, gfile, result):
++        try:
++            stream = gfile.read_finish(result)
++        except gio.Error, e:
++            self.stop()
++            logging.exception('Error while fetching content from %s' %
++                    self._url)
++            return
++        stream.read_async(4096, self.__stream_read_cb)
++
++    def __stream_read_cb(self, stream, result):
++        data = stream.read_finish(result)
++        if not data:
++            self._data_finished()
++            return
++        self._data_read(data)
++        stream.read_async(4096, self.__stream_read_cb)
++
++    def _data_read(self, data):
++        self._data += data
++
++    def read_finish(self):
++        pass
++
++    def _data_finished(self):
++        self.emit('progress', ACTION_CHECKING, 'Fetching update '
++                'information', 2, 3)
++        parser = MicroformatParser(self._data, self._completion_cb)
++        gobject.idle_add(parser.parse)
+diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
+index 7ea445f..d7fd528 100755
+--- a/extensions/cpsection/updater/model.py
++++ b/extensions/cpsection/updater/model.py
+@@ -37,8 +37,26 @@
+ 
+ from jarabe.model import bundleregistry
+ 
+-from backends import aslo
++from backends import microformat
+ 
++class MetaBundle():
++
++    def __init__(self, bundle_id, version, name):
++        self._bundle_id = bundle_id
++        self._version = version
++        self._name = name
++
++    def get_name(self):
++        return self._name
++
++    def get_bundle_id(self):
++        return self._bundle_id
++
++    def get_icon(self):
++        pass
++
++    def get_activity_version(self):
++        return self._version
+ 
+ class UpdateModel(gobject.GObject):
+     __gtype_name__ = 'SugarUpdateModel'
+@@ -63,45 +81,51 @@ def __init__(self):
+         self._downloader = None
+         self._cancelling = False
+ 
++    def __progress_cb(self, model, action, description, current, total):
++        self.emit('progress', action, description, current, total)
++
+     def check_updates(self):
+         self.updates = []
++        self._current_bundles = {}
++        for bundle in bundleregistry.get_registry():
++            self._current_bundles[bundle.get_bundle_id()] =\
++                    {'version':bundle.get_activity_version(),
++                            'bundle': bundle}
+         self._bundles_to_check = list(bundleregistry.get_registry())
+-        self._check_next_update()
+-
+-    def _check_next_update(self):
+-        total = len(bundleregistry.get_registry())
+-        current = total - len(self._bundles_to_check)
++        self._fetcher = microformat._UpdateFetcher(self.__bundle_info_fetched_cb)
++        self._fetcher.connect('progress', self.__progress_cb)
++        gobject.idle_add(self._fetcher.download_bundle_updates)
+ 
+-        if not self._bundles_to_check:
+-            return False
+-
+-        bundle = self._bundles_to_check.pop()
+-        self.emit('progress', UpdateModel.ACTION_CHECKING, bundle.get_name(),
+-                  current, total)
+-
+-        aslo.fetch_update_info(bundle, self.__check_completed_cb)
+-
+-    def __check_completed_cb(self, bundle, version, link, size, error_message):
++    def __bundle_info_fetched_cb(self, new_bundles, error_message):
+         if error_message is not None:
+             logging.error('Error getting update information from server:\n'
+                           '%s' % error_message)
+ 
+-        if version is not None and \
+-                version > NormalizedVersion(bundle.get_activity_version()):
+-            self.updates.append(BundleUpdate(bundle, version, link, size))
+-
+         if self._cancelling:
+             self._cancel_checking()
+-        elif self._bundles_to_check:
+-            gobject.idle_add(self._check_next_update)
+         else:
+-            total = len(bundleregistry.get_registry())
+-            if bundle is None:
+-                name = ''
+-            else:
+-                name = bundle.get_name()
+-            self.emit('progress', UpdateModel.ACTION_CHECKING, name, total,
+-                      total)
++            for bundle_id, info in new_bundles.items():
++                if bundle_id in self._current_bundles:
++                    if new_bundles[bundle_id]['version'] >\
++                        self._current_bundles[bundle_id]['version']:
++                        self.updates.append(BundleUpdate(
++                            self._current_bundles[bundle_id]['bundle'],
++                            new_bundles[bundle_id]['version'],
++                            new_bundles[bundle_id]['url'],
++                            new_bundles[bundle_id]['size'],
++                            'update'))
++                else:
++                    bundle = MetaBundle(bundle_id,
++                            new_bundles[bundle_id]['version'],
++                            new_bundles[bundle_id]['name'])
++                    self.updates.append(BundleUpdate(bundle,
++                        new_bundles[bundle_id]['version'],
++                        new_bundles[bundle_id]['url'],
++                        new_bundles[bundle_id]['size'],
++                        'new'))
++
++        self.emit('progress', UpdateModel.ACTION_CHECKING, 'Fetching update '
++                'information', 3, 3)
+ 
+     def update(self, bundle_ids):
+         self._bundles_to_update = []
+@@ -226,12 +250,15 @@ def _cancel_updating(self):
+ 
+ class BundleUpdate(object):
+ 
+-    def __init__(self, bundle, version, link, size):
++    def __init__(self, bundle, version, link, size, package_type = None):
+         self.bundle = bundle
+         self.version = version
+         self.link = link
+         self.size = size
+ 
++        # Specify whether installing a new bundle or updating an
++        # existing one
++        self.package_type = package_type
+ 
+ class _Downloader(gobject.GObject):
+     _CHUNK_SIZE = 10240  # 10K
+diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
+index 814658f..30875e4 100644
+--- a/extensions/cpsection/updater/view.py
++++ b/extensions/cpsection/updater/view.py
+@@ -122,7 +122,7 @@ def __progress_cb(self, model, action, bundle_name, current, total):
+             return
+ 
+         if action == UpdateModel.ACTION_CHECKING:
+-            message = _('Checking %s...') % bundle_name
++            message = _('%s...') % bundle_name
+         elif action == UpdateModel.ACTION_DOWNLOADING:
+             message = _('Downloading %s...') % bundle_name
+         elif action == UpdateModel.ACTION_UPDATING:
+@@ -361,11 +361,17 @@ def __init__(self, model):
+             row[self.SELECTED] = True
+             row[self.ICON_FILE_NAME] = bundle_update.bundle.get_icon()
+ 
+-            details = _('From version %(current)s to %(new)s (Size: %(size)s)')
+-            details = details % \
+-                    {'current': bundle_update.bundle.get_activity_version(),
+-                     'new': bundle_update.version,
+-                     'size': _format_size(bundle_update.size)}
++            if bundle_update.package_type == 'update':
++                details = _('From version %(current)d to %(new)s (Size: %(size)s)')
++                details = details % \
++                        {'current': bundle_update.bundle.get_activity_version(),
++                         'new': bundle_update.version,
++                         'size': _format_size(bundle_update.size)}
++            elif bundle_update.package_type == 'new':
++                details = _('Install new activity version %(new)s (Size: %(size)s)')
++                details = details % \
++                        {'new': bundle_update.version,
++                         'size': _format_size(bundle_update.size)}
+ 
+             row[self.DESCRIPTION] = '<b>%s</b>\n%s' % \
+                     (bundle_update.bundle.get_name(), details)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0061-Don-t-choke-on-non-integer-activities.patch b/rpms/sugar/0061-Don-t-choke-on-non-integer-activities.patch
new file mode 100644
index 0000000..7933006
--- /dev/null
+++ b/rpms/sugar/0061-Don-t-choke-on-non-integer-activities.patch
@@ -0,0 +1,63 @@
+From 8f2c08718bff601b1f94dadd0c47a63b6db22c7d Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajaygargnsit@gmail.com>
+Date: Fri, 9 Sep 2011 17:21:50 +0000
+Subject: [PATCH sugar 61/74] Don't choke on non-integer activities
+
+Since Sugar 0.92 activity versions can be non-integer strings.
+
+Signed-off-by: Ajay Garg <ajay@sugarlabs.org>
+[split out from other patch, added description, correctly handle comparison;
+ include fix from Jerry Vonau]
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ .../cpsection/updater/backends/microformat.py      |    2 +-
+ extensions/cpsection/updater/model.py              |    6 ++++--
+ extensions/cpsection/updater/view.py               |    2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py
+index 97499aa..ca4f1d5 100644
+--- a/extensions/cpsection/updater/backends/microformat.py
++++ b/extensions/cpsection/updater/backends/microformat.py
+@@ -133,7 +133,7 @@ def handle_starttag(self, tag, attrs):
+ 
+     def handle_data(self, data):
+         if self._inside_activity_version:
+-            self._activity_version = int(data)
++            self._activity_version = str(data)
+             self._inside_activity_version = False
+ 
+         elif self._inside_activity_id:
+diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
+index d7fd528..1a3941c 100755
+--- a/extensions/cpsection/updater/model.py
++++ b/extensions/cpsection/updater/model.py
+@@ -106,8 +106,10 @@ def __bundle_info_fetched_cb(self, new_bundles, error_message):
+         else:
+             for bundle_id, info in new_bundles.items():
+                 if bundle_id in self._current_bundles:
+-                    if new_bundles[bundle_id]['version'] >\
+-                        self._current_bundles[bundle_id]['version']:
++                    old_version = self._current_bundles[bundle_id]['version']
++                    new_version = new_bundles[bundle_id]['version']
++                    if NormalizedVersion(old_version) < \
++                       NormalizedVersion(new_version):
+                         self.updates.append(BundleUpdate(
+                             self._current_bundles[bundle_id]['bundle'],
+                             new_bundles[bundle_id]['version'],
+diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
+index 30875e4..559ab8d 100644
+--- a/extensions/cpsection/updater/view.py
++++ b/extensions/cpsection/updater/view.py
+@@ -362,7 +362,7 @@ def __init__(self, model):
+             row[self.ICON_FILE_NAME] = bundle_update.bundle.get_icon()
+ 
+             if bundle_update.package_type == 'update':
+-                details = _('From version %(current)d to %(new)s (Size: %(size)s)')
++                details = _('From version %(current)s to %(new)s (Size: %(size)s)')
+                 details = details % \
+                         {'current': bundle_update.bundle.get_activity_version(),
+                          'new': bundle_update.version,
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0062-updater-Only-pre-select-already-installed-activities.patch b/rpms/sugar/0062-updater-Only-pre-select-already-installed-activities.patch
new file mode 100644
index 0000000..5135637
--- /dev/null
+++ b/rpms/sugar/0062-updater-Only-pre-select-already-installed-activities.patch
@@ -0,0 +1,37 @@
+From f20db12c6428f4124fd9feac7828f0a2ffa740a9 Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajaygargnsit@gmail.com>
+Date: Fri, 9 Sep 2011 17:21:50 +0000
+Subject: [PATCH sugar 62/74] updater: Only pre-select already installed
+ activities (fixes SL#2822, AU#383)
+
+OLPC AU uses the software updater to offer easy installing of optional
+activities. For this to work properly new activities must not be selected by
+default.
+
+Signed-off-by: Ajay Garg <ajay@sugarlabs.org>
+[adjusted description, split off unrelated bug fixes, set default value]
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ extensions/cpsection/updater/view.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
+index 559ab8d..891f552 100644
+--- a/extensions/cpsection/updater/view.py
++++ b/extensions/cpsection/updater/view.py
+@@ -358,10 +358,11 @@ def __init__(self, model):
+         for bundle_update in model.updates:
+             row = [None] * 5
+             row[self.BUNDLE_ID] = bundle_update.bundle.get_bundle_id()
+-            row[self.SELECTED] = True
++            row[self.SELECTED] = False
+             row[self.ICON_FILE_NAME] = bundle_update.bundle.get_icon()
+ 
+             if bundle_update.package_type == 'update':
++                row[self.SELECTED] = True
+                 details = _('From version %(current)s to %(new)s (Size: %(size)s)')
+                 details = details % \
+                         {'current': bundle_update.bundle.get_activity_version(),
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0063-Add-quz-and-aym-to-ALL_LINGUAS-take-2.patch b/rpms/sugar/0063-Add-quz-and-aym-to-ALL_LINGUAS-take-2.patch
new file mode 100644
index 0000000..c00a7b0
--- /dev/null
+++ b/rpms/sugar/0063-Add-quz-and-aym-to-ALL_LINGUAS-take-2.patch
@@ -0,0 +1,26 @@
+From 2c5be25e218629f1b074bf0340ce4ca0ff715d17 Mon Sep 17 00:00:00 2001
+From: bernie <bernie@codewiz.org>
+Date: Fri, 25 Nov 2011 20:34:51 +0000
+Subject: [PATCH sugar 63/74] Add quz and aym to ALL_LINGUAS (take 2)
+
+Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86f6116..8e6d871 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ PKG_CHECK_MODULES(SHELL, pygtk-2.0 gtk+-2.0 gconf-2.0)
+ 
+ # Setup GETTEXT
+ #
+-ALL_LINGUAS="af am ar ay bg bi bn_IN bn ca cpp cs da de dz el en es fa_AF fa ff fil fr gu ha he hi ht hu id ig is it ja km ko kos mg mi mk ml mn mr ms mvo nb ne nl pa pap pis pl ps pt_BR pt qu ro ru rw sd si sk sl sq sv sw ta te th tpi tr tvl tzo ug ur vi wa yo zh_CN zh_TW"
++ALL_LINGUAS="af am ar ay aym bg bi bn_IN bn ca cpp cs da de dz el en es fa_AF fa ff fil fr gu ha he hi ht hu id ig is it ja km ko kos mg mi mk ml mn mr ms mvo nb ne nl pa pap pis pl ps pt_BR pt qu quz ro ru rw sd si sk sl sq sv sw ta te th tpi tr tvl tzo ug ur vi wa yo zh_CN zh_TW"
+ 
+ GETTEXT_PACKAGE=sugar
+ AC_PROG_INTLTOOL([0.33])
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0064-sugar-session-export-manual-Gnome-proxy-settings-as-.patch b/rpms/sugar/0064-sugar-session-export-manual-Gnome-proxy-settings-as-.patch
new file mode 100644
index 0000000..a5aa53e
--- /dev/null
+++ b/rpms/sugar/0064-sugar-session-export-manual-Gnome-proxy-settings-as-.patch
@@ -0,0 +1,73 @@
+From 005a15f4c6954d5a2d25f3762b1f702117e854e2 Mon Sep 17 00:00:00 2001
+From: Jerry Vonau <jvonau@shaw.ca>
+Date: Mon, 12 Dec 2011 19:09:06 +0100
+Subject: [PATCH sugar 64/74] sugar-session: export manual Gnome proxy
+ settings as $http_proxy
+
+Some applications and tools and even some parts of Sugar will use the
+http_proxy environment variable if set, but don't use the Gnome (GConf) proxy
+settings.
+
+After changing the GConf proxy settings, Sugar needs to be restarted for the
+http_proxy environment variable to be updated.
+
+[factored out into separate function; some clean-ups; added description]
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ bin/sugar-session |   26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index ee0048d..7eaa8f1 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -2,6 +2,7 @@
+ # Copyright (C) 2006, Red Hat, Inc.
+ # Copyright (C) 2009, One Laptop Per Child Association Inc
+ # Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
++# Copyright (C) 2011, OLPC-AU.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -211,6 +212,30 @@ def setup_accessibility_cb():
+     accessibility_manager = accessibility.AccessibilityManager()
+     accessibility_manager.setup_accessibility()
+ 
++
++def export_proxy_settings():
++    """Export manual proxy settings from GConf as environment variables
++
++    Some applications and tools and even some parts of Sugar will use
++    the http_proxy environment variable if set, but don't use the Gnome
++    (GConf) proxy settings.
++    """
++    client = gconf.client_get_default()
++    if client.get_string('/system/proxy/mode') != 'manual':
++        return
++
++    http_host = client.get_string('/system/http_proxy/host')
++    http_port = client.get_int('/system/http_proxy/port')
++    use_auth = client.get_bool('/system/http_proxy/use_authentication')
++    proxy_info = '%s:%d' % (http_host, http_port)
++    if use_auth:
++        user = client.get_string('/system/http_proxy/authentication_user')
++        pword = client.get_string('/system/http_proxy/authentication_password')
++        proxy_info = '%s:%s@%s' % (user, pword, proxy_info)
++
++    os.environ['http_proxy'] = 'http://%s/' % proxy_info
++
++
+ def main():
+     try:
+         from sugar import env
+@@ -253,6 +278,7 @@ def main():
+     if timezone is not None and timezone:
+         os.environ['TZ'] = timezone
+ 
++    export_proxy_settings()
+     set_fonts()
+ 
+     # this must be added early, so that it executes and unfreezes the screen
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0065-au-687-Add-network-proxy-config-extension-to-CP.patch b/rpms/sugar/0065-au-687-Add-network-proxy-config-extension-to-CP.patch
new file mode 100644
index 0000000..8839ba1
--- /dev/null
+++ b/rpms/sugar/0065-au-687-Add-network-proxy-config-extension-to-CP.patch
@@ -0,0 +1,893 @@
+From 68ad7ab88202258cd023ee0a467f1101852c6be0 Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@sugarlabs.org>
+Date: Tue, 8 Nov 2011 23:18:02 +0000
+Subject: [PATCH sugar 65/74] au#687: Add network proxy config extension to CP
+
+This work has been done and maintained by:
+
+Aleksey Lim <alsroot@activitycentral.org>
+
+here:
+
+http://git.sugarlabs.org/alsroot/proxy_cp
+
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+[merged a few fix-up patches from Aleksey]
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ configure.ac                           |    1 +
+ data/icons/Makefile.am                 |    3 +-
+ data/icons/module-proxy.svg            |  361 +++++++++++++++++++++++++++++
+ extensions/cpsection/Makefile.am       |    1 +
+ extensions/cpsection/proxy/Makefile.am |    6 +
+ extensions/cpsection/proxy/__init__.py |   21 ++
+ extensions/cpsection/proxy/model.py    |   14 ++
+ extensions/cpsection/proxy/view.py     |  389 ++++++++++++++++++++++++++++++++
+ 8 files changed, 795 insertions(+), 1 deletions(-)
+ create mode 100644 data/icons/module-proxy.svg
+ create mode 100644 extensions/cpsection/proxy/Makefile.am
+ create mode 100644 extensions/cpsection/proxy/__init__.py
+ create mode 100644 extensions/cpsection/proxy/model.py
+ create mode 100644 extensions/cpsection/proxy/view.py
+
+diff --git a/configure.ac b/configure.ac
+index 8e6d871..fa7165c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,7 @@ extensions/cpsection/network/Makefile
+ extensions/cpsection/power/Makefile
+ extensions/cpsection/updater/backends/Makefile
+ extensions/cpsection/updater/Makefile
++extensions/cpsection/proxy/Makefile
+ extensions/deviceicon/Makefile
+ extensions/globalkey/Makefile
+ extensions/Makefile
+diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
+index 2497c4a..2582c31 100644
+--- a/data/icons/Makefile.am
++++ b/data/icons/Makefile.am
+@@ -11,6 +11,7 @@ sugar_DATA =                        \
+ 	module-modemconfiguration.svg	\
+ 	module-network.svg              \
+ 	module-power.svg                \
+-	module-updater.svg
++	module-updater.svg		\
++	module-proxy.svg
+ 
+ EXTRA_DIST = $(sugar_DATA)
+diff --git a/data/icons/module-proxy.svg b/data/icons/module-proxy.svg
+new file mode 100644
+index 0000000..a22a7a8
+--- /dev/null
++++ b/data/icons/module-proxy.svg
+@@ -0,0 +1,361 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://creativecommons.org/ns#"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:xlink="http://www.w3.org/1999/xlink"
++   version="1.1"
++   width="55"
++   height="55"
++   id="svg3063">
++  <defs
++     id="defs3065">
++    <clipPath
++       id="SVGID_5_">
++      <use
++         id="use3018"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-7">
++      <use
++         id="use3018-6"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-1">
++      <use
++         id="use3018-4"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-12">
++      <use
++         id="use3018-3"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-3">
++      <use
++         id="use3018-41"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-0">
++      <use
++         id="use3018-2"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-8">
++      <use
++         id="use3018-65"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-06">
++      <use
++         id="use3018-1"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <clipPath
++       id="SVGID_5_-82">
++      <use
++         id="use3018-9"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_4_" />
++    </clipPath>
++    <defs
++       id="defs3508">
++      <path
++         d="m 23.589,42.098 c 10.277,0 18.616,-8.373 18.616,-18.645 0,-10.207 -8.338,-18.581 -18.616,-18.581 -10.206,0 -18.615,8.374 -18.615,18.581 0,10.272 8.41,18.645 18.615,18.645 z"
++         id="SVGID_3_" />
++    </defs>
++    <clipPath
++       id="SVGID_4_">
++      <use
++         id="use3512"
++         style="overflow:visible"
++         x="0"
++         y="0"
++         width="1"
++         height="1"
++         xlink:href="#SVGID_3_" />
++    </clipPath>
++    <radialGradient
++       cx="685.64899"
++       cy="995.40698"
++       r="96.022903"
++       id="SVGID_5_-4"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(0.315,0,0,0.315,-193.939,-303.123)">
++      <stop
++         id="stop3515"
++         style="stop-color:#ffffff;stop-opacity:1"
++         offset="0" />
++      <stop
++         id="stop3517"
++         style="stop-color:#57adff;stop-opacity:1"
++         offset="0.59549999" />
++      <stop
++         id="stop3519"
++         style="stop-color:#c9e6ff;stop-opacity:1"
++         offset="0.99440002" />
++    </radialGradient>
++    <linearGradient
++       x1="868.99597"
++       y1="-1149.41"
++       x2="868.99597"
++       y2="-1269.5601"
++       id="SVGID_6_"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(0.315,0,0,-0.315,-250.166,-358.406)">
++      <stop
++         id="stop3524"
++         style="stop-color:#006a00;stop-opacity:1"
++         offset="0" />
++      <stop
++         id="stop3526"
++         style="stop-color:#004000;stop-opacity:1"
++         offset="0.2" />
++      <stop
++         id="stop3528"
++         style="stop-color:#00bd00;stop-opacity:1"
++         offset="1" />
++    </linearGradient>
++    <radialGradient
++       cx="685.64899"
++       cy="995.40698"
++       r="96.022903"
++       id="radialGradient3603"
++       xlink:href="#SVGID_5_-4"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(0.315,0,0,0.315,-193.939,-303.123)" />
++  </defs>
++  <metadata
++     id="metadata3068">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++        <dc:title></dc:title>
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <g
++     transform="matrix(0.09164839,0,0,0.09164839,-0.05430278,-41.447306)"
++     id="layer1">
++    <path
++       d="m 200.897,116.781 c -1.04,0 -2.184,0.428 -3.348,1.089 2.741,-0.802 4.03,-1.089 3.348,-1.089 m 67.869,13.235 0.677,-9.925 -10.473,0.655 1.382,9.27 h 8.414 M 150.528,301.594 c -2.113,-1.988 -0.699,-10.608 -0.699,-10.608 0,0 -31.488,-16.545 -65.767,-26.493 -4.227,-1.225 -2.091,-9.932 2.091,-13.23 l -1.387,-9.297 c -0.693,-4.622 7.005,-27.148 14.698,-29.12 7.699,-2 -0.705,13.235 -0.705,13.235 l -7.688,4.637 c 0,0 9.092,10.592 11.199,10.592 2.092,0 5.591,-5.31 5.591,-5.31 l -9.79,-6.604 9.091,-3.988 0.574,-3.489 1.528,-0.487 15.062,-22.809 c 10.407,-4.258 23.199,-9.535 24.824,-10.31 2.806,-1.316 22.387,-12.569 25.887,-15.213 3.51,-2.666 11.187,-1.988 13.982,-1.988 2.812,0 7,-1.333 7.698,-8.631 0.699,-7.281 3.5,-8.608 5.607,-6.615 2.102,1.967 -2.107,5.293 2.796,6.615 4.893,1.333 9.092,4.644 12.597,1.333 2.557,-2.422 -0.867,-5.186 -3.17,-7.271 h 38.846 l 4.205,-11.947 -9.097,-1.321 -33.596,-3.305 v -3.982 l -2.676,0.456 c 3.635,-19.987 25.236,-16.692 
++8.972,-28.259 -0.986,-0.71 -15.213,22.418 -18.837,21.97 -6.562,-0.868 -15.029,-0.938 -16.833,1.197 -2.396,2.817 5.363,-9.688 12.038,-13.479 -7.964,2.346 -22.234,-4.903 -47.964,13.273 -8.701,6.15 -30.541,31.066 -39.528,40.645 -37.968,44.826 -41.029,83.175 -41.029,84.876 0,3.31 8.04,5.179 8.733,9.167 0.704,3.95 -13.29,17.218 -13.29,23.839 0,3.044 -7.005,36.114 8.381,77.496 13.647,39.257 40.054,73.879 43.445,76.046 l 9.725,-5.158 c 0,0 -16.091,-28.486 -16.784,-31.141 -0.693,-2.647 18.188,-41.068 27.295,-39.727 9.091,1.29 6.994,3.968 12.591,0.65 5.602,-3.292 9.096,-30.479 15.392,-33.113 6.301,-2.663 13.29,-5.969 12.596,-12.592 -0.729,-6.644 -24.513,-18.557 -26.604,-20.54 m 151.819,-194.755 -18.888,-6.626 3.5,10.608 15.388,-3.982 m -70.666,24.511 c 2.107,0 44.074,-27.81 39.881,-28.481 -4.188,-0.655 -4.887,0 -16.102,-1.327 -11.177,-1.322 -23.084,15.901 -25.875,18.562 -2.802,2.647 -1.859,11.246 2.096,11.246 m 192.63,199.731 5.42,-7.031 -5.42,-1.905
++ -4.062,5.104 -4.734,7.02 4.05,1.909 4.746,-5.097 m 23.687,22.995 -1.356,-10.228 h -8.785 l -0.682,7.659 -8.139,-1.269 -2.016,-8.3 -4.063,-2.559 -4.745,5.745 -4.735,-1.268 -1.366,4.452 5.428,1.301 v 41.479 l 19.159,4.615 c -0.445,0.759 -0.771,1.41 -0.879,1.756 -1.364,4.477 5.406,6.415 10.144,4.477 1.753,-0.705 12.797,-4.952 16.295,-13.283 4.879,-11.605 8.03,-28.314 8.877,-33.722 l -2.146,-4.693 -13.545,5.117 -7.466,-1.28 h 0.02 m -6.783,-169.88 c -30.978,-46.973 -105.41,-77.669 -105.41,-77.669 l -19.166,10.039 -2.722,-4.453 -6.761,-2.563 v 5.753 l 6.091,5.115 -4.053,1.912 -15.582,1.268 -35.211,19.158 3.381,15.322 -4.075,1.284 -2.015,3.186 11.512,17.223 0.671,5.759 -9.476,1.913 v 11.486 l -5.412,1.273 0.677,8.944 -46.058,31.938 1.355,17.852 c 3.38,4.475 29.798,31.293 29.798,31.293 0,0 30.464,1.263 37.237,-2.551 6.777,-3.831 2.025,3.831 4.068,5.748 2.016,1.923 2.709,15.322 4.724,16.601 2.038,1.271 0,8.923 2.709,11.502 2.71,2.534 2.71,33.19 2.71,33.19 0,0 16.252,27.445
++ 16.252,34.468 0,7.021 -0.683,6.382 12.189,5.742 12.863,-0.628 15.571,-5.742 18.281,-7.649 2.709,-1.908 2.709,-6.383 5.417,-10.229 2.731,-3.839 7.455,-18.499 13.556,-23.602 6.078,-5.126 22.343,-8.96 23.686,-17.879 1.356,-8.949 7.443,-15.972 7.443,-15.972 l 29.278,-30.968 -0.823,4.161 -0.671,15.95 8.81,-3.187 -0.672,-17.25 -3.154,-3.343 0.446,-0.487 c 0,0 -2.037,-3.831 -4.734,-3.831 -2.712,0 -18.974,3.831 -21.672,3.196 -2.711,-0.644 -14.228,-31.292 -16.253,-32.549 -2.039,-1.279 -14.889,-22.359 -14.889,-22.359 0,0 29.776,35.751 34.521,49.795 2.751,8.18 13.089,0.563 21.497,-7.97 l 2.222,5.429 5.407,-1.29 -0.671,-6.381 h 6.088 v 9.573 l -2.024,5.115 -0.694,8.29 5.429,5.119 2.71,-4.459 8.776,-8.311 10.162,-5.108 2.721,5.108 1.354,7.027 -2.709,7.655 -5.417,4.47 -2.708,11.491 v 5.743 l -6.091,-3.836 -0.671,-12.118 -8.8,0.648 -4.051,10.842 6.089,8.948 14.216,1.92 11.507,-10.868 1.354,-21.044 5.127,-6.766 c 3.337,8.576 5.722,17.548 5.722,25.914 0,9.167 7.259,-4.628 3.707,-32.583
++ 0.003,-0.001 -5.567,-66.402 -36.255,-97.088 z m -135.423,27.505 -36.561,-1.294 15.56,-12.759 h 8.127 l 12.874,8.928 v 5.125 m 44.706,-4.469 v 5.743 h -15.569 l 1.354,3.841 -9.493,1.289 -0.66,3.169 -6.772,-1.256 -12.2,-2.568 2.038,-3.181 2.037,-3.846 6.771,-7.022 2.72,5.115 10.142,-0.646 5.418,-5.754 20.999,3.836 -6.785,1.28 m 1.345,-8.305 -8.128,1.273 -1.343,-5.753 10.143,-1.268 1.366,-5.743 7.454,7.666 -9.492,3.814 v 0.011 m 39.289,198.535 -4.746,3.837 0.674,9.579 h 6.088 v -8.278 l 5.441,-7.043 v -14.672 l -3.404,-0.662 -4.053,17.239 0,0 m -45.369,-19.135 c 0,0 -4.746,1.234 0.662,3.185 5.418,1.93 27.09,-31.271 27.09,-31.271 l -18.291,11.487 -9.472,16.6 h 0.011 m -36.862,122.355 -4.052,-3.858 -8.127,-1.289 -1.343,3.869 -10.836,-1.278 -0.681,-5.135 h -8.123 l -8.798,5.135 h -15.56 l -1.355,-3.856 -25.041,-2.59 -4.063,3.867 -10.138,-2.556 -1.359,-9.016 -4.735,-0.661 -5.418,9.677 -18.273,-0.65 c 3.272,1.538 30.551,17.824 72.403,21.214 55.5,4.487 81.896,-8.991 81.896,-8.991 
++l -2.025,-1.951 
++-24.371,-1.918 v -0.013 l -10e-4,0 z"
++       transform="matrix(1.1261275,0,0,1.1261275,592.13313,769.48419)"
++       clip-path="url(#SVGID_5_-12)"
++       id="path3315"
++       style="fill:#000000" />
++    <path
++       d="m 200.897,116.781 c -1.04,0 -2.184,0.428 -3.348,1.089 2.741,-0.802 4.03,-1.089 3.348,-1.089 m 67.869,13.235 0.677,-9.925 -10.473,0.655 1.382,9.27 h 8.414 M 150.528,301.594 c -2.113,-1.988 -0.699,-10.608 -0.699,-10.608 0,0 -31.488,-16.545 -65.767,-26.493 -4.227,-1.225 -2.091,-9.932 2.091,-13.23 l -1.387,-9.297 c -0.693,-4.622 7.005,-27.148 14.698,-29.12 7.699,-2 -0.705,13.235 -0.705,13.235 l -7.688,4.637 c 0,0 9.092,10.592 11.199,10.592 2.092,0 5.591,-5.31 5.591,-5.31 l -9.79,-6.604 9.091,-3.988 0.574,-3.489 1.528,-0.487 15.062,-22.809 c 10.407,-4.258 23.199,-9.535 24.824,-10.31 2.806,-1.316 22.387,-12.569 25.887,-15.213 3.51,-2.666 11.187,-1.988 13.982,-1.988 2.812,0 7,-1.333 7.698,-8.631 0.699,-7.281 3.5,-8.608 5.607,-6.615 2.102,1.967 -2.107,5.293 2.796,6.615 4.893,1.333 9.092,4.644 12.597,1.333 2.557,-2.422 -0.867,-5.186 -3.17,-7.271 h 38.846 l 4.205,-11.947 -9.097,-1.321 -33.596,-3.305 v -3.982 l -2.676,0.456 c 3.635,-19.987 25.236,-16.692 8.972,-28.259 -0.986,-0.71 
++-15.213,22.418 -18.837,21.97 -6.562,-0.868 -15.029,-0.938 -16.833,1.197 -2.396,2.817 5.363,-9.688 12.038,-13.479 -7.964,2.346 -22.234,-4.903 -47.964,13.273 -8.701,6.15 -30.541,31.066 -39.528,40.645 -37.968,44.826 -41.029,83.175 -41.029,84.876 0,3.31 8.04,5.179 8.733,9.167 0.704,3.95 -13.29,17.218 -13.29,23.839 0,3.044 -7.005,36.114 8.381,77.496 13.647,39.257 40.054,73.879 43.445,76.046 l 9.725,-5.158 c 0,0 -16.091,-28.486 -16.784,-31.141 -0.693,-2.647 18.188,-41.068 27.295,-39.727 9.091,1.29 6.994,3.968 12.591,0.65 5.602,-3.292 9.096,-30.479 15.392,-33.113 6.301,-2.663 13.29,-5.969 12.596,-12.592 -0.729,-6.644 -24.513,-18.557 -26.604,-20.54 m 151.819,-194.755 -18.888,-6.626 3.5,10.608 15.388,-3.982 m -70.666,24.511 c 2.107,0 44.074,-27.81 39.881,-28.481 -4.188,-0.655 -4.887,0 -16.102,-1.327 -11.177,-1.322 -23.084,15.901 -25.875,18.562 -2.802,2.647 -1.859,11.246 2.096,11.246 m 192.63,199.731 5.42,-7.031 -5.42,-1.905 -4.062,5.104 -4.734,7.02 4.05,1.909 4.746,-5.097
++ m 23.687,22.995 -1.356,-10.228 h -8.785 l -0.682,7.659 -8.139,-1.269 -2.016,-8.3 -4.063,-2.559 -4.745,5.745 -4.735,-1.268 -1.366,4.452 5.428,1.301 v 41.479 l 19.159,4.615 c -0.445,0.759 -0.771,1.41 -0.879,1.756 -1.364,4.477 5.406,6.415 10.144,4.477 1.753,-0.705 12.797,-4.952 16.295,-13.283 4.879,-11.605 8.03,-28.314 8.877,-33.722 l -2.146,-4.693 -13.545,5.117 -7.466,-1.28 h 0.02 m -6.783,-169.88 c -30.978,-46.973 -105.41,-77.669 -105.41,-77.669 l -19.166,10.039 -2.722,-4.453 -6.761,-2.563 v 5.753 l 6.091,5.115 -4.053,1.912 -15.582,1.268 -35.211,19.158 3.381,15.322 -4.075,1.284 -2.015,3.186 11.512,17.223 0.671,5.759 -9.476,1.913 v 11.486 l -5.412,1.273 0.677,8.944 -46.058,31.938 1.355,17.852 c 3.38,4.475 29.798,31.293 29.798,31.293 0,0 30.464,1.263 37.237,-2.551 6.777,-3.831 2.025,3.831 4.068,5.748 2.016,1.923 2.709,15.322 4.724,16.601 2.038,1.271 0,8.923 2.709,11.502 2.71,2.534 2.71,33.19 2.71,33.19 0,0 16.252,27.445 16.252,34.468 0,7.021 -0.683,6.382 12.189,5.742 12.863,-0.628 
++15.571,-5.742 18.281,-7.649 2.709,-1.908 2.709,-6.383 5.417,-10.229 2.731,-3.839 7.455,-18.499 13.556,-23.602 6.078,-5.126 22.343,-8.96 23.686,-17.879 1.356,-8.949 7.443,-15.972 7.443,-15.972 l 29.278,-30.968 -0.823,4.161 -0.671,15.95 8.81,-3.187 -0.672,-17.25 -3.154,-3.343 0.446,-0.487 c 0,0 -2.037,-3.831 -4.734,-3.831 -2.712,0 -18.974,3.831 -21.672,3.196 -2.711,-0.644 -14.228,-31.292 -16.253,-32.549 -2.039,-1.279 -14.889,-22.359 -14.889,-22.359 0,0 29.776,35.751 34.521,49.795 2.751,8.18 13.089,0.563 21.497,-7.97 l 2.222,5.429 5.407,-1.29 -0.671,-6.381 h 6.088 v 9.573 l -2.024,5.115 -0.694,8.29 5.429,5.119 2.71,-4.459 8.776,-8.311 10.162,-5.108 2.721,5.108 1.354,7.027 -2.709,7.655 -5.417,4.47 -2.708,11.491 v 5.743 l -6.091,-3.836 -0.671,-12.118 -8.8,0.648 -4.051,10.842 6.089,8.948 14.216,1.92 11.507,-10.868 1.354,-21.044 5.127,-6.766 c 3.337,8.576 5.722,17.548 5.722,25.914 0,9.167 7.259,-4.628 3.707,-32.583 0.003,-0.001 -5.567,-66.402 -36.255,-97.088 z m -135.423,27.505
++ -36.561,-1.294 15.56,-12.759 h 8.127 l 12.874,8.928 v 5.125 m 44.706,-4.469 v 5.743 h -15.569 l 1.354,3.841 -9.493,1.289 -0.66,3.169 -6.772,-1.256 -12.2,-2.568 2.038,-3.181 2.037,-3.846 6.771,-7.022 2.72,5.115 10.142,-0.646 5.418,-5.754 20.999,3.836 -6.785,1.28 m 1.345,-8.305 -8.128,1.273 -1.343,-5.753 10.143,-1.268 1.366,-5.743 7.454,7.666 -9.492,3.814 v 0.011 m 39.289,198.535 -4.746,3.837 0.674,9.579 h 6.088 v -8.278 l 5.441,-7.043 v -14.672 l -3.404,-0.662 -4.053,17.239 0,0 m -45.369,-19.135 c 0,0 -4.746,1.234 0.662,3.185 5.418,1.93 27.09,-31.271 27.09,-31.271 l -18.291,11.487 -9.472,16.6 h 0.011 m -36.862,122.355 -4.052,-3.858 -8.127,-1.289 -1.343,3.869 -10.836,-1.278 -0.681,-5.135 h -8.123 l -8.798,5.135 h -15.56 l -1.355,-3.856 -25.041,-2.59 -4.063,3.867 -10.138,-2.556 -1.359,-9.016 -4.735,-0.661 -5.418,9.677 -18.273,-0.65 c 3.272,1.538 30.551,17.824 72.403,21.214 55.5,4.487 81.896,-8.991 81.896,-8.991 l -2.025,-1.951 -24.371,-1.918 v -0.013 l -10e-4,0 z"
++       transform="matrix(1.1261275,0,0,1.1261275,-123.16579,191.65755)"
++       clip-path="url(#SVGID_5_-3)"
++       id="path3315-1"
++       style="fill:#000000" />
++    <path
++       d="m 200.897,116.781 c -1.04,0 -2.184,0.428 -3.348,1.089 2.741,-0.802 4.03,-1.089 3.348,-1.089 m 67.869,13.235 0.677,-9.925 -10.473,0.655 1.382,9.27 h 8.414 M 150.528,301.594 c -2.113,-1.988 -0.699,-10.608 -0.699,-10.608 0,0 -31.488,-16.545 -65.767,-26.493 -4.227,-1.225 -2.091,-9.932 2.091,-13.23 l -1.387,-9.297 c -0.693,-4.622 7.005,-27.148 14.698,-29.12 7.699,-2 -0.705,13.235 -0.705,13.235 l -7.688,4.637 c 0,0 9.092,10.592 11.199,10.592 2.092,0 5.591,-5.31 5.591,-5.31 l -9.79,-6.604 9.091,-3.988 0.574,-3.489 1.528,-0.487 15.062,-22.809 c 10.407,-4.258 23.199,-9.535 24.824,-10.31 2.806,-1.316 22.387,-12.569 25.887,-15.213 3.51,-2.666 11.187,-1.988 13.982,-1.988 2.812,0 7,-1.333 7.698,-8.631 0.699,-7.281 3.5,-8.608 5.607,-6.615 2.102,1.967 -2.107,5.293 2.796,6.615 4.893,1.333 9.092,4.644 12.597,1.333 2.557,-2.422 -0.867,-5.186 -3.17,-7.271 h 38.846 l 4.205,-11.947 -9.097,-1.321 -33.596,-3.305 v -3.982 l -2.676,0.456 c 3.635,-19.987 25.236,-16.692 8.972,-28.259 -0.986,-0.71
++ -15.213,22.418 -18.837,21.97 -6.562,-0.868 -15.029,-0.938 -16.833,1.197 -2.396,2.817 5.363,-9.688 12.038,-13.479 -7.964,2.346 -22.234,-4.903 -47.964,13.273 -8.701,6.15 -30.541,31.066 -39.528,40.645 -37.968,44.826 -41.029,83.175 -41.029,84.876 0,3.31 8.04,5.179 8.733,9.167 0.704,3.95 -13.29,17.218 -13.29,23.839 0,3.044 -7.005,36.114 8.381,77.496 13.647,39.257 40.054,73.879 43.445,76.046 l 9.725,-5.158 c 0,0 -16.091,-28.486 -16.784,-31.141 -0.693,-2.647 18.188,-41.068 27.295,-39.727 9.091,1.29 6.994,3.968 12.591,0.65 5.602,-3.292 9.096,-30.479 15.392,-33.113 6.301,-2.663 13.29,-5.969 12.596,-12.592 -0.729,-6.644 -24.513,-18.557 -26.604,-20.54 m 151.819,-194.755 -18.888,-6.626 3.5,10.608 15.388,-3.982 m -70.666,24.511 c 2.107,0 44.074,-27.81 39.881,-28.481 -4.188,-0.655 -4.887,0 -16.102,-1.327 -11.177,-1.322 -23.084,15.901 -25.875,18.562 -2.802,2.647 -1.859,11.246 2.096,11.246 m 192.63,199.731 5.42,-7.031 -5.42,-1.905 -4.062,5.104 -4.734,7.02 4.05,1.909
++ 4.746,-5.097 m 23.687,22.995 -1.356,-10.228 h -8.785 l -0.682,7.659 -8.139,-1.269 -2.016,-8.3 -4.063,-2.559 -4.745,5.745 -4.735,-1.268 -1.366,4.452 5.428,1.301 v 41.479 l 19.159,4.615 c -0.445,0.759 -0.771,1.41 -0.879,1.756 -1.364,4.477 5.406,6.415 10.144,4.477 1.753,-0.705 12.797,-4.952 16.295,-13.283 4.879,-11.605 8.03,-28.314 8.877,-33.722 l -2.146,-4.693 -13.545,5.117 -7.466,-1.28 h 0.02 m -6.783,-169.88 c -30.978,-46.973 -105.41,-77.669 -105.41,-77.669 l -19.166,10.039 -2.722,-4.453 -6.761,-2.563 v 5.753 l 6.091,5.115 -4.053,1.912 -15.582,1.268 -35.211,19.158 3.381,15.322 -4.075,1.284 -2.015,3.186 11.512,17.223 0.671,5.759 -9.476,1.913 v 11.486 l -5.412,1.273 0.677,8.944 -46.058,31.938 1.355,17.852 c 3.38,4.475 29.798,31.293 29.798,31.293 0,0 30.464,1.263 37.237,-2.551 6.777,-3.831 2.025,3.831 4.068,5.748 2.016,1.923 2.709,15.322 4.724,16.601 2.038,1.271 0,8.923 2.709,11.502 2.71,2.534 2.71,33.19 2.71,33.19 0,0 16.252,27.445 16.252,34.468 0,7.021 -0.683,6.382
++ 12.189,5.742 12.863,-0.628 15.571,-5.742 18.281,-7.649 2.709,-1.908 2.709,-6.383 5.417,-10.229 2.731,-3.839 7.455,-18.499 13.556,-23.602 6.078,-5.126 22.343,-8.96 23.686,-17.879 1.356,-8.949 7.443,-15.972 7.443,-15.972 l 29.278,-30.968 -0.823,4.161 -0.671,15.95 8.81,-3.187 -0.672,-17.25 -3.154,-3.343 0.446,-0.487 c 0,0 -2.037,-3.831 -4.734,-3.831 -2.712,0 -18.974,3.831 -21.672,3.196 -2.711,-0.644 -14.228,-31.292 -16.253,-32.549 -2.039,-1.279 -14.889,-22.359 -14.889,-22.359 0,0 29.776,35.751 34.521,49.795 2.751,8.18 13.089,0.563 21.497,-7.97 l 2.222,5.429 5.407,-1.29 -0.671,-6.381 h 6.088 v 9.573 l -2.024,5.115 -0.694,8.29 5.429,5.119 2.71,-4.459 8.776,-8.311 10.162,-5.108 2.721,5.108 1.354,7.027 -2.709,7.655 -5.417,4.47 -2.708,11.491 v 5.743 l -6.091,-3.836 -0.671,-12.118 -8.8,0.648 -4.051,10.842 6.089,8.948 14.216,1.92 11.507,-10.868 1.354,-21.044 5.127,-6.766 c 3.337,8.576 5.722,17.548 5.722,25.914 0,9.167 7.259,-4.628 3.707,-32.583 0.003,-0.001 -5.567,-66.402 -36.255,-97.088 
++z m -135.423,27.505 -36.561,-1.294 15.56,-12.759 h 8.127 l 12.874,8.928 v 5.125 m 44.706,-4.469 v 5.743 h -15.569 l 1.354,3.841 -9.493,1.289 -0.66,3.169 -6.772,-1.256 -12.2,-2.568 2.038,-3.181 2.037,-3.846 6.771,-7.022 2.72,5.115 10.142,-0.646 5.418,-5.754 20.999,3.836 -6.785,1.28 m 1.345,-8.305 -8.128,1.273 -1.343,-5.753 10.143,-1.268 1.366,-5.743 7.454,7.666 -9.492,3.814 v 0.011 m 39.289,198.535 -4.746,3.837 0.674,9.579 h 6.088 v -8.278 l 5.441,-7.043 v -14.672 l -3.404,-0.662 -4.053,17.239 0,0 m -45.369,-19.135 c 0,0 -4.746,1.234 0.662,3.185 5.418,1.93 27.09,-31.271 27.09,-31.271 l -18.291,11.487 -9.472,16.6 h 0.011 m -36.862,122.355 -4.052,-3.858 -8.127,-1.289 -1.343,3.869 -10.836,-1.278 -0.681,-5.135 h -8.123 l -8.798,5.135 h -15.56 l -1.355,-3.856 -25.041,-2.59 -4.063,3.867 -10.138,-2.556 -1.359,-9.016 -4.735,-0.661 -5.418,9.677 -18.273,-0.65 c 3.272,1.538 30.551,17.824 72.403,21.214 55.5,4.487 81.896,-8.991 81.896,-8.991 l -2.025,-1.951 -24.371,-1.918 v -0.013 l -10e-4,0 z"
++       transform="matrix(1.1261275,0,0,1.1261275,-123.16579,191.65755)"
++       clip-path="url(#SVGID_5_-0)"
++       id="path3315-4"
++       style="fill:#000000" />
++    <path
++       d="m 200.897,116.781 c -1.04,0 -2.184,0.428 -3.348,1.089 2.741,-0.802 4.03,-1.089 3.348,-1.089 m 67.869,13.235 0.677,-9.925 -10.473,0.655 1.382,9.27 h 8.414 M 150.528,301.594 c -2.113,-1.988 -0.699,-10.608 -0.699,-10.608 0,0 -31.488,-16.545 -65.767,-26.493 -4.227,-1.225 -2.091,-9.932 2.091,-13.23 l -1.387,-9.297 c -0.693,-4.622 7.005,-27.148 14.698,-29.12 7.699,-2 -0.705,13.235 -0.705,13.235 l -7.688,4.637 c 0,0 9.092,10.592 11.199,10.592 2.092,0 5.591,-5.31 5.591,-5.31 l -9.79,-6.604 9.091,-3.988 0.574,-3.489 1.528,-0.487 15.062,-22.809 c 10.407,-4.258 23.199,-9.535 24.824,-10.31 2.806,-1.316 22.387,-12.569 25.887,-15.213 3.51,-2.666 11.187,-1.988 13.982,-1.988 2.812,0 7,-1.333 7.698,-8.631 0.699,-7.281 3.5,-8.608 5.607,-6.615 2.102,1.967 -2.107,5.293 2.796,6.615 4.893,1.333 9.092,4.644 12.597,1.333 2.557,-2.422 -0.867,-5.186 -3.17,-7.271 h 38.846 l 4.205,-11.947 -9.097,-1.321 -33.596,-3.305 v -3.982 l -2.676,0.456 c 3.635,-19.987 25.236,-16.692 8.972,-28.259 -0.986,-0.71 
++-15.213,22.418 -18.837,21.97 -6.562,-0.868 -15.029,-0.938 -16.833,1.197 -2.396,2.817 5.363,-9.688 12.038,-13.479 -7.964,2.346 -22.234,-4.903 -47.964,13.273 -8.701,6.15 -30.541,31.066 -39.528,40.645 -37.968,44.826 -41.029,83.175 -41.029,84.876 0,3.31 8.04,5.179 8.733,9.167 0.704,3.95 -13.29,17.218 -13.29,23.839 0,3.044 -7.005,36.114 8.381,77.496 13.647,39.257 40.054,73.879 43.445,76.046 l 9.725,-5.158 c 0,0 -16.091,-28.486 -16.784,-31.141 -0.693,-2.647 18.188,-41.068 27.295,-39.727 9.091,1.29 6.994,3.968 12.591,0.65 5.602,-3.292 9.096,-30.479 15.392,-33.113 6.301,-2.663 13.29,-5.969 12.596,-12.592 -0.729,-6.644 -24.513,-18.557 -26.604,-20.54 m 151.819,-194.755 -18.888,-6.626 3.5,10.608 15.388,-3.982 m -70.666,24.511 c 2.107,0 44.074,-27.81 39.881,-28.481 -4.188,-0.655 -4.887,0 -16.102,-1.327 -11.177,-1.322 
++-23.084,15.901 -25.875,18.562 -2.802,2.647 -1.859,11.246 2.096,11.246 m 192.63,199.731 5.42,-7.031 -5.42,-1.905 -4.062,5.104 -4.734,7.02 4.05,1.909 4.746,-5.097 m 23.687,22.995 -1.356,-10.228 h -8.785 l -0.682,7.659 -8.139,-1.269 -2.016,-8.3 -4.063,-2.559 -4.745,5.745 -4.735,-1.268 -1.366,4.452 5.428,1.301 v 41.479 l 19.159,4.615 c -0.445,0.759 -0.771,1.41 -0.879,1.756 -1.364,4.477 5.406,6.415 10.144,4.477 1.753,-0.705 12.797,-4.952 16.295,-13.283 4.879,-11.605 8.03,-28.314 8.877,-33.722 l -2.146,-4.693 -13.545,5.117 -7.466,-1.28 h 0.02 m -6.783,-169.88 c -30.978,-46.973 -105.41,-77.669 -105.41,-77.669 l -19.166,10.039 -2.722,-4.453 -6.761,-2.563
++ v 5.753 l 6.091,5.115 -4.053,1.912 -15.582,1.268 -35.211,19.158 3.381,15.322 -4.075,1.284 -2.015,3.186 11.512,17.223 0.671,5.759 -9.476,1.913 v 11.486 l -5.412,1.273 0.677,8.944 -46.058,31.938 1.355,17.852 c 3.38,4.475 29.798,31.293 29.798,31.293 0,0 30.464,1.263 37.237,-2.551 6.777,-3.831 2.025,3.831 4.068,5.748 2.016,1.923 2.709,15.322 4.724,16.601 2.038,1.271 0,8.923 2.709,11.502 2.71,2.534 2.71,33.19 2.71,33.19 0,0 16.252,27.445 16.252,34.468 0,7.021 -0.683,6.382 12.189,5.742 12.863,-0.628 15.571,-5.742 18.281,-7.649 2.709,-1.908 2.709,-6.383 5.417,-10.229 2.731,-3.839 7.455,-18.499 13.556,-23.602 6.078,-5.126 22.343,-8.96 23.686,-17.879 1.356,-8.949 7.443,-15.972 7.443,-15.972 l 29.278,-30.968 -0.823,4.161 -0.671,15.95 8.81,-3.187 -0.672,-17.25 -3.154,-3.343 0.446,-0.487 c 0,0 -2.037,-3.831 -4.734,-3.831
++ -2.712,0 -18.974,3.831 -21.672,3.196 -2.711,-0.644 -14.228,-31.292 -16.253,-32.549 -2.039,-1.279 -14.889,-22.359 -14.889,-22.359 0,0 29.776,35.751 34.521,49.795 2.751,8.18 13.089,0.563 21.497,-7.97 l 2.222,5.429 5.407,-1.29 -0.671,-6.381 h 6.088 v 9.573 l -2.024,5.115 -0.694,8.29 5.429,5.119 2.71,-4.459 8.776,-8.311 10.162,-5.108 2.721,5.108 1.354,7.027 -2.709,7.655 -5.417,4.47 -2.708,11.491 v 5.743 l -6.091,-3.836 -0.671,-12.118 -8.8,0.648 -4.051,10.842 6.089,8.948 14.216,1.92 11.507,-10.868 1.354,-21.044 5.127,-6.766 c 3.337,8.576 5.722,17.548 5.722,25.914 0,9.167 7.259,-4.628 3.707,-32.583 0.003,-0.001 -5.567,-66.402 -36.255,-97.088
++ z m -135.423,27.505 -36.561,-1.294 15.56,-12.759 h 8.127 l 12.874,8.928 v 5.125 m 44.706,-4.469 v 5.743 h -15.569 l 1.354,3.841 -9.493,1.289 -0.66,3.169 -6.772,-1.256 -12.2,-2.568 2.038,-3.181 2.037,-3.846 6.771,-7.022 2.72,5.115 10.142,-0.646 5.418,-5.754 20.999,3.836 -6.785,1.28 m 1.345,-8.305 -8.128,1.273 -1.343,-5.753 10.143,-1.268 1.366,-5.743 7.454,7.666 -9.492,3.814 v 0.011 m 39.289,198.535 -4.746,3.837 0.674,9.579 h 6.088 v -8.278 l 5.441,-7.043 v -14.672 l -3.404,-0.662 -4.053,17.239 0,0 m -45.369,-19.135 c 0,0 -4.746,1.234 0.662,3.185 5.418,1.93 27.09,-31.271 27.09,-31.271 l -18.291,11.487 -9.472,16.6 h 0.011 m
++ -36.862,122.355 -4.052,-3.858 -8.127,-1.289 -1.343,3.869 -10.836,-1.278 -0.681,-5.135 h -8.123 l -8.798,5.135 h -15.56 l -1.355,-3.856 -25.041,-2.59 -4.063,3.867 -10.138,-2.556 -1.359,-9.016 -4.735,-0.661 -5.418,9.677 -18.273,-0.65 c 3.272,1.538 30.551,17.824 72.403,21.214 55.5,4.487 81.896,-8.991 81.896,-8.991 l -2.025,-1.951 -24.371,-1.918 v -0.013 l -10e-4,0 z"
++       transform="matrix(1.1261275,0,0,1.1261275,-123.16579,191.65755)"
++       clip-path="url(#SVGID_5_-8)"
++       id="path3315-0"
++       style="fill:#000000" />
++    <path
++       d="m 200.897,116.781 c -1.04,0 -2.184,0.428 -3.348,1.089 2.741,-0.802 4.03,-1.089 3.348,-1.089 m 67.869,13.235 0.677,-9.925 -10.473,0.655 1.382,9.27 h 8.414 M 150.528,301.594 c -2.113,-1.988 -0.699,-10.608 -0.699,-10.608 0,0 -31.488,-16.545 -65.767,-26.493 -4.227,-1.225 -2.091,-9.932 2.091,-13.23 l -1.387,-9.297 c -0.693,-4.622 7.005,-27.148 14.698,-29.12 7.699,-2 -0.705,13.235 -0.705,13.235 l -7.688,4.637 c 0,0 9.092,10.592 11.199,10.592 2.092,0 5.591,-5.31 5.591,-5.31 l -9.79,-6.604 9.091,-3.988 0.574,-3.489 1.528,-0.487 15.062,-22.809 c 10.407,-4.258 23.199,-9.535 24.824,-10.31 2.806,-1.316 22.387,-12.569 25.887,-15.213 3.51,-2.666 11.187,-1.988 13.982,-1.988 2.812,0 7,-1.333 7.698,-8.631 0.699,-7.281 3.5,-8.608 5.607,-6.615 2.102,1.967 -2.107,5.293 2.796,6.615 4.893,1.333 9.092,4.644 12.597,1.333 2.557,-2.422 -0.867,-5.186 -3.17,-7.271 h 38.846 l 4.205,-11.947 -9.097,-1.321 -33.596,-3.305 v -3.982 l -2.676,0.456 c 3.635,-19.987 25.236,-16.692 8.972,-28.259
++ -0.986,-0.71 -15.213,22.418 -18.837,21.97 -6.562,-0.868 -15.029,-0.938 -16.833,1.197 -2.396,2.817 5.363,-9.688 12.038,-13.479 -7.964,2.346 -22.234,-4.903 -47.964,13.273 -8.701,6.15 -30.541,31.066 -39.528,40.645 -37.968,44.826 -41.029,83.175 -41.029,84.876 0,3.31 8.04,5.179 8.733,9.167 0.704,3.95 -13.29,17.218 -13.29,23.839 0,3.044 -7.005,36.114 8.381,77.496 13.647,39.257 40.054,73.879 43.445,76.046 l 9.725,-5.158 c 0,0 -16.091,-28.486 -16.784,-31.141 -0.693,-2.647 18.188,-41.068 27.295,-39.727 9.091,1.29 6.994,3.968 12.591,0.65 5.602,-3.292 9.096,-30.479 15.392,-33.113 6.301,-2.663 13.29,-5.969 12.596,-12.592 -0.729,-6.644 -24.513,-18.557 -26.604,-20.54 m 151.819,-194.755 -18.888,-6.626 3.5,10.608 15.388,-3.982 m -70.666,24.511 c 2.107,0 44.074,-27.81 39.881,-28.481 -4.188,-0.655 -4.887,0 -16.102,-1.327 -11.177,-1.322 -23.084,15.901 -25.875,18.562 -2.802,2.647 -1.859,11.246 2.096,11.246 m 192.63,199.731 5.42,-7.031 -5.42,-1.905 -4.062,5.104 -4.734,7.02 4.05,1.909 4.746,-5.097
++ m 23.687,22.995 -1.356,-10.228 h -8.785 l -0.682,7.659 -8.139,-1.269 -2.016,-8.3 -4.063,-2.559 -4.745,5.745 -4.735,-1.268 -1.366,4.452 5.428,1.301 v 41.479 l 19.159,4.615 c -0.445,0.759 -0.771,1.41 -0.879,1.756 -1.364,4.477 5.406,6.415 10.144,4.477 1.753,-0.705 12.797,-4.952 16.295,-13.283 4.879,-11.605 8.03,-28.314 8.877,-33.722 l -2.146,-4.693 -13.545,5.117 -7.466,-1.28 h 0.02 m -6.783,-169.88 c -30.978,-46.973 -105.41,-77.669 -105.41,-77.669 l -19.166,10.039 -2.722,-4.453 -6.761,-2.563 v 5.753 l 6.091,5.115 -4.053,1.912 -15.582,1.268 -35.211,19.158 3.381,15.322 -4.075,1.284 -2.015,3.186 11.512,17.223 0.671,5.759 -9.476,1.913 v 11.486 l -5.412,1.273 0.677,8.944 -46.058,31.938 1.355,17.852 c 3.38,4.475 29.798,31.293 29.798,31.293 0,0 30.464,1.263 37.237,-2.551 6.777,-3.831 2.025,3.831 4.068,5.748
++ 2.016,1.923 2.709,15.322 4.724,16.601 2.038,1.271 0,8.923 2.709,11.502 2.71,2.534 2.71,33.19 2.71,33.19 0,0 16.252,27.445 16.252,34.468 0,7.021 -0.683,6.382 12.189,5.742 12.863,-0.628 15.571,-5.742 18.281,-7.649 2.709,-1.908 2.709,-6.383 5.417,-10.229 2.731,-3.839 7.455,-18.499 13.556,-23.602 6.078,-5.126 22.343,-8.96 23.686,-17.879 1.356,-8.949 7.443,-15.972 7.443,-15.972 l 29.278,-30.968 -0.823,4.161 -0.671,15.95 8.81,-3.187 -0.672,-17.25 -3.154,-3.343 0.446,-0.487 c 0,0 -2.037,-3.831 -4.734,-3.831 -2.712,0 -18.974,3.831 -21.672,3.196 -2.711,-0.644 -14.228,-31.292 -16.253,-32.549 -2.039,-1.279 -14.889,-22.359 -14.889,-22.359 0,0 29.776,35.751 34.521,49.795 2.751,8.18 13.089,0.563 21.497,-7.97 l 2.222,5.429 5.407,-1.29 -0.671,-6.381 h 6.088 v 9.573 l -2.024,5.115 -0.694,8.29 5.429,5.119 2.71,-4.459
++ 8.776,-8.311 10.162,-5.108 2.721,5.108 1.354,7.027 -2.709,7.655 -5.417,4.47 -2.708,11.491 v 5.743 l -6.091,-3.836 -0.671,-12.118 -8.8,0.648 -4.051,10.842 6.089,8.948 14.216,1.92 11.507,-10.868 1.354,-21.044 5.127,-6.766 c 3.337,8.576 5.722,17.548 5.722,25.914 0,9.167 7.259,-4.628 3.707,-32.583 0.003,-0.001 -5.567,-66.402 -36.255,-97.088 z m -135.423,27.505 -36.561,-1.294 15.56,-12.759 h 8.127 l 12.874,8.928 v 5.125 m 44.706,-4.469 v 5.743 h -15.569 l 1.354,3.841 -9.493,1.289 -0.66,3.169 -6.772,-1.256 -12.2,-2.568 2.038,-3.181 2.037,-3.846 6.771,-7.022 2.72,5.115 10.142,-0.646 5.418,-5.754 20.999,3.836 -6.785,1.28 m 1.345,-8.305 -8.128,1.273 -1.343,-5.753 10.143,-1.268 1.366,-5.743 7.454,7.666 -9.492,3.814 v 0.011 m 39.289,198.535 -4.746,3.837 0.674,9.579 h 6.088 v -8.278 l 5.441,-7.043 v -14.672
++ l -3.404,-0.662 -4.053,17.239 0,0 m -45.369,-19.135 c 0,0 -4.746,1.234 0.662,3.185 5.418,1.93 27.09,-31.271 27.09,-31.271 l -18.291,11.487 -9.472,16.6 h 0.011 m -36.862,122.355 -4.052,-3.858 -8.127,-1.289 -1.343,3.869 -10.836,-1.278 -0.681,-5.135 h -8.123 l -8.798,5.135 h -15.56 l -1.355,-3.856 -25.041,-2.59 -4.063,3.867 -10.138,-2.556 -1.359,-9.016 -4.735,-0.661 -5.418,9.677 -18.273,-0.65 c 3.272,1.538 30.551,17.824 72.403,21.214 55.5,4.487 81.896,-8.991 81.896,-8.991 l -2.025,-1.951 -24.371,-1.918 v -0.013 l -10e-4,0 z"
++       transform="matrix(1.1261275,0,0,1.1261275,-104.21727,237.13399)"
++       clip-path="url(#SVGID_5_-06)"
++       id="path3315-3"
++       style="fill:#ff00ff" />
++    <radialGradient
++       cx="24.223101"
++       cy="24.3286"
++       r="20.4727"
++       id="SVGID_1_"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(7.6562887,0,0,7.6562887,-72.160001,452.7993)">
++      <stop
++         id="stop3491"
++         style="stop-color:#000000;stop-opacity:0.40000001"
++         offset="0.94760001" />
++      <stop
++         id="stop3493"
++         style="stop-color:#000000;stop-opacity:0"
++         offset="1" />
++    </radialGradient>
++    <linearGradient
++       x1="625.57001"
++       y1="1036.85"
++       x2="755.56299"
++       y2="1036.85"
++       id="SVGID_2_"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(2.4117309,0,0,2.4117309,-1392.3581,-2431.4769)">
++      <stop
++         id="stop3498"
++         style="stop-color:#0053bd;stop-opacity:1"
++         offset="0" />
++      <stop
++         id="stop3500"
++         style="stop-color:#0032a4;stop-opacity:1"
++         offset="0.99440002" />
++    </linearGradient>
++    <g
++       transform="matrix(1.9140664,0,0,1.9140664,-1228.1565,-289.91756)"
++       id="g3606"
++       style="fill:#ffffff;fill-opacity:1;stroke:none">
++      <path
++         d="m 798.36657,387.8025 c -41.59662,0 -80.86439,16.33954 -110.59375,46 -29.75234,29.67577 -46.15625,68.91869 -46.15625,110.5 0,86.562 70.31816,156.96875 156.75,156.96875 86.4395,0 156.78125,-70.40675 156.78125,-156.96875 0,-86.28638 -70.34175,-156.5 -156.78125,-156.5 z m 0,6.46875 c 82.87167,0 150.3125,67.31271 150.3125,150.03125 0,83.00182 -67.44083,150.53125 -150.3125,150.53125 -82.86401,0 -150.28125,-67.53708 -150.28125,-150.53125 0,-39.84333 15.72267,-77.44782 44.25,-105.90625 28.51202,-28.44311 66.16496,-44.125 106.03125,-44.125 z"
++         id="path3502"
++         style="fill:#ffffff;fill-opacity:1;stroke:none" />
++      <path
++         d="m 17.279,6.581 c -0.094,0 -0.197,0.039 -0.302,0.098 0.247,-0.073 0.363,-0.098 0.302,-0.098 m 6.117,1.192 0.061,-0.895 -0.944,0.059 0.125,0.835 h 0.758 M 12.739,23.237 c -0.19,-0.179 -0.063,-0.956 -0.063,-0.956 0,0 -2.838,-1.491 -5.927,-2.388 -0.381,-0.11 -0.188,-0.895 0.188,-1.192 L 6.812,17.863 c -0.063,-0.417 0.631,-2.447 1.325,-2.625 0.694,-0.18 -0.063,1.193 -0.063,1.193 l -0.693,0.418 c 0,0 0.819,0.955 1.009,0.955 0.188,0 0.504,-0.479 0.504,-0.479 L 8.012,16.73 8.831,16.371 8.883,16.057 9.021,16.013 10.378,13.957 c 0.938,-0.384 2.091,-0.859 2.237,-0.929 0.253,-0.119 2.018,-1.133 2.333,-1.371 0.316,-0.24 1.008,-0.179 1.26,-0.179 0.253,0 0.631,-0.12 0.694,-0.778 0.063,-0.656 0.315,-0.776 0.505,-0.596 0.189,0.177 -0.19,0.477 0.252,0.596 0.441,0.12 0.819,0.418 1.135,0.12 0.23,-0.218 -0.078,-0.467 -0.286,-0.655 h 3.501 L 22.388,9.088 21.568,8.969 18.542,8.67 V 8.312 L 18.3,8.353 C 18.628,6.552 20.574,6.849 19.109,5.806 19.02,5.742 
++17.738,7.827 17.411,7.786 16.82,7.708 16.057,7.702 15.894,7.894 15.678,8.148 16.377,7.021 16.979,6.679 16.261,6.89 14.975,6.237 12.656,7.875 c -0.784,0.554 -2.752,2.8 -3.563,3.663 -3.422,4.04 -3.698,7.496 -3.698,7.649 0,0.298 0.725,0.467 0.787,0.826 0.063,0.356 -1.198,1.552 -1.198,2.148 0,0.274 -0.631,3.255 0.755,6.984 1.23,3.538 3.61,6.658 3.916,6.854 l 0.876,-0.465 c 0,0 -1.45,-2.567 -1.513,-2.807 -0.063,-0.238 1.639,-3.701 2.46,-3.58 0.819,0.116 0.63,0.357 1.135,0.059 0.505,-0.297 0.82,-2.747 1.387,-2.984 0.568,-0.24 1.198,-0.538 1.135,-1.135 -0.064,-0.598 -2.207,-1.671 -2.396,-1.85 M 26.422,5.685 24.72,5.087 25.035,6.043 26.422,5.685 m -6.369,2.209 c 0.19,0 3.972,-2.506 3.594,-2.567 -0.377,-0.059 -0.44,0 -1.451,-0.12 -1.007,-0.119 -2.081,1.433 -2.332,1.673 -0.252,0.239 -0.167,1.014 0.189,1.014 m 17.361,18.001 0.488,-0.634 -0.488,-0.172 -0.366,0.46 -0.427,0.633 0.365,0.172 0.428,-0.459 m 2.135,2.072 -0.122,-0.922 h -0.792 l -0.062,0.69 -0.733,-0.114
++ -0.182,-0.748 -0.366,-0.23 -0.428,0.518 -0.427,-0.114 -0.123,0.401 0.489,0.117 v 3.738 l 1.727,0.416 c -0.04,0.068 -0.069,0.127 -0.079,0.158 -0.123,0.403 0.487,0.578 0.914,0.403 0.158,-0.063 1.153,-0.446 1.469,-1.197 0.439,-1.046 0.724,-2.552 0.8,-3.039 l -0.193,-0.423 -1.221,0.461 -0.673,-0.115 h 0.002 M 38.938,12.656 c -2.792,-4.233 -9.5,-7 -9.5,-7 L 27.71,6.561 27.465,6.16 26.856,5.929 v 0.519 l 0.549,0.461 -0.365,0.172 -1.404,0.114 -3.173,1.727 0.305,1.381 -0.367,0.116 -0.182,0.287 1.038,1.552 0.061,0.519 -0.854,0.172 v 1.035 l -0.488,0.115 0.061,0.806 -4.151,2.878 0.122,1.609 c 0.305,0.403 2.686,2.82 2.686,2.82 0,0 2.746,0.114 3.356,-0.23 0.611,-0.345 0.183,0.345 0.367,0.518 0.182,0.173 0.244,1.381 0.426,1.496 0.184,0.115 0,0.804 0.244,1.037 0.244,0.229 0.244,2.991 0.244,2.991 0,0 1.465,2.474
++ 1.465,3.106 0,0.632 -0.062,0.575 1.099,0.518 1.159,-0.057 1.403,-0.518 1.647,-0.689 0.244,-0.171 0.244,-0.575 0.488,-0.922 0.246,-0.346 0.672,-1.667 1.222,-2.127 0.548,-0.462 2.014,-0.808 2.135,-1.611 0.122,-0.807 0.671,-1.439 0.671,-1.439 l 2.639,-2.791 -0.074,0.375 -0.061,1.438 0.794,-0.287 -0.061,-1.555 -0.284,-0.301 0.04,-0.044 c 0,0 -0.184,-0.345 -0.427,-0.345 -0.244,0 -1.71,0.345 -1.953,0.288 -0.244,-0.058 -1.282,-2.82 -1.465,-2.934 -0.184,-0.115 -1.342,-2.015 -1.342,-2.015 0,0 2.684,3.222 3.111,4.488 0.248,0.737 1.18,0.051 1.938,-0.718 l 0.2,0.489 0.487,-0.116 -0.061,-0.575 h 0.549 v 0.863 l -0.183,0.461 -0.063,0.747 0.489,0.461 0.244,-0.402 0.791,-0.749 0.916,-0.46 0.245,0.46 0.122,0.633 -0.244,0.69 -0.488,0.403 -0.244,1.036 v 0.518 l -0.549,-0.346 -0.061,-1.092 -0.793,0.059
++ -0.365,0.977 0.549,0.807 1.281,0.173 1.037,-0.979 0.122,-1.896 0.462,-0.61 c 0.301,0.773 0.516,1.582 0.516,2.335 0,0.826 0.654,-0.417 0.334,-2.937 -0.001,-0.003 -0.503,-5.987 -3.268,-8.753 z m -12.206,2.479 -3.295,-0.117 1.402,-1.15 h 0.732 l 1.16,0.805 v 0.462 m 4.031,-0.403 v 0.518 h -1.403 l 0.122,0.346 -0.855,0.116 -0.06,0.286 -0.61,-0.113 -1.1,-0.231 0.184,-0.287 0.184,-0.347 0.61,-0.633 0.245,0.461 0.914,-0.058 0.488,-0.519 1.893,0.346 -0.612,0.115 m 0.121,-0.748 -0.732,0.115 -0.121,-0.519 0.914,-0.114 0.123,-0.518 0.672,0.691 -0.856,0.345 0,0 m 3.541,17.893 -0.428,0.346 0.061,0.863 h 0.549 V 32.34 l 0.49,-0.635 v -1.322 l -0.307,-0.06 -0.365,1.554 0,0 m -4.089,-1.725 c 0,0 -0.428,0.111 0.06,0.287 0.488,0.174 2.441,-2.818 2.441,-2.818 l -1.648,1.035 -0.853,1.496 0,0 M 27.013,41.18 26.648,40.832 
++25.916,40.716 25.795,41.065 24.818,40.95 24.756,40.487 h -0.732 l -0.793,0.463 h -1.402 l -0.122,-0.348 -2.257,-0.233 -0.366,0.349 -0.914,-0.23 -0.123,-0.813 -0.427,-0.06 -0.488,0.872 -1.647,-0.059 c 0.295,0.139 2.753,1.606 6.525,1.912 5.002,0.404 7.381,-0.811 7.381,-0.811 l -0.183,-0.176 -2.195,-0.173 0,0 0,0 z"
++         transform="matrix(7.6562887,0,0,7.6562887,617.77417,363.90588)"
++         clip-path="url(#SVGID_4_)"
++         id="path3530"
++         style="fill:#ffffff;fill-opacity:1;stroke:none" />
++    </g>
++    <linearGradient
++       x1="690.94098"
++       y1="977.15698"
++       x2="690.94098"
++       y2="1069.14"
++       id="SVGID_7_"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(2.4117309,0,0,2.4117309,-1790.3582,-1817.4903)">
++      <stop
++         id="stop3533"
++         style="stop-color:#ffffff;stop-opacity:1"
++         offset="0" />
++      <stop
++         id="stop3535"
++         style="stop-color:#94caff;stop-opacity:1"
++         offset="1" />
++    </linearGradient>
++    <linearGradient
++       x1="25.3057"
++       y1="5.1606002"
++       x2="19.853399"
++       y2="32.2952"
++       id="SVGID_8_"
++       gradientUnits="userSpaceOnUse"
++       gradientTransform="matrix(7.6562887,0,0,7.6562887,-188.32754,493.2054)">
++      <stop
++         id="stop3540"
++         style="stop-color:#ffffff;stop-opacity:1"
++         offset="0" />
++      <stop
++         id="stop3542"
++         style="stop-color:#00a100;stop-opacity:1"
++         offset="0.49720001" />
++      <stop
++         id="stop3544"
++         style="stop-color:#000000;stop-opacity:1"
++         offset="0.99440002" />
++    </linearGradient>
++    <g
++       transform="translate(501.9182,0)"
++       id="g3844">
++      <rect
++         width="227.90614"
++         height="227.90614"
++         ry="0"
++         x="-320.85956"
++         y="656.74127"
++         id="rect3805"
++         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:24.57014275;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
++      <path
++         d="m -214.39085,651.34781 135.802859,-0.90944 0,232.96394 -136.712299,-58.35238 z"
++         id="rect3805-9"
++         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:27.06029701;stroke-miterlimit:4;stroke-opacity:1" />
++    </g>
++  </g>
++</svg>
+diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
+index d623380..78d548b 100644
+--- a/extensions/cpsection/Makefile.am
++++ b/extensions/cpsection/Makefile.am
+@@ -10,6 +10,7 @@ SUBDIRS = \
+ 	network \
+ 	power \
+ 	updater \
++	proxy \
+ 	#
+ 
+ sugardir = $(pkgdatadir)/extensions/cpsection
+diff --git a/extensions/cpsection/proxy/Makefile.am b/extensions/cpsection/proxy/Makefile.am
+new file mode 100644
+index 0000000..bfb2929
+--- /dev/null
++++ b/extensions/cpsection/proxy/Makefile.am
+@@ -0,0 +1,6 @@
++sugardir = $(pkgdatadir)/extensions/cpsection/proxy
++
++sugar_PYTHON = \
++	__init__.py	\
++	model.py \
++	view.py
+diff --git a/extensions/cpsection/proxy/__init__.py b/extensions/cpsection/proxy/__init__.py
+new file mode 100644
+index 0000000..399afa4
+--- /dev/null
++++ b/extensions/cpsection/proxy/__init__.py
+@@ -0,0 +1,21 @@
++# Copyright (C) 2011, Aleksey Lim
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++from gettext import gettext as _
++
++
++CLASS = 'Proxy'
++ICON = 'module-proxy'
++TITLE = _('Proxy')
+diff --git a/extensions/cpsection/proxy/model.py b/extensions/cpsection/proxy/model.py
+new file mode 100644
+index 0000000..c88b116
+--- /dev/null
++++ b/extensions/cpsection/proxy/model.py
+@@ -0,0 +1,14 @@
++# Copyright (C) 2011, Aleksey Lim
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+diff --git a/extensions/cpsection/proxy/view.py b/extensions/cpsection/proxy/view.py
+new file mode 100644
+index 0000000..2edc3cd
+--- /dev/null
++++ b/extensions/cpsection/proxy/view.py
+@@ -0,0 +1,389 @@
++# Copyright (C) 2011, Aleksey Lim
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import re
++
++import gtk
++import gconf
++from gettext import gettext as _
++
++from sugar.graphics import style
++
++from jarabe.controlpanel.sectionview import SectionView
++
++
++_widget_sensitivies = {}
++_gconf_origin_values = {}
++
++ICON = 'module-proxy'
++
++class Proxy(SectionView):
++
++    def __init__(self, model, alerts):
++        SectionView.__init__(self)
++        self.set_border_width(style.DEFAULT_SPACING * 2)
++        self.set_spacing(style.DEFAULT_SPACING)
++        self.setup()
++
++    def setup(self):
++        for i in self.get_children():
++            self.remove(i)
++            # Destroy all widgets and connection to avoid any interfering
++            i.destroy()
++
++        _widget_sensitivies.clear()
++
++        workspace = gtk.VBox()
++        workspace.show()
++
++        scrolled = gtk.ScrolledWindow()
++        scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
++        scrolled.add_with_viewport(workspace)
++        scrolled.show()
++        self.add(scrolled)
++
++        def add_section(section, label_text):
++            separator = gtk.HSeparator()
++            separator.show()
++            workspace.pack_start(separator, expand=False)
++
++            label = gtk.Label(label_text)
++            label.set_alignment(0, 0)
++            label.show()
++            workspace.pack_start(label, expand=False)
++
++            section.set_border_width(style.DEFAULT_SPACING * 2)
++            section.show()
++            workspace.pack_start(section, expand=False)
++
++        add_section(_ProxySection(),
++                _('Configure Proxies to Access the Internet'))
++        add_section(_IgnoreSection(), _('Ignore Host List'))
++
++    def undo(self):
++        conf = gconf.client_get_default()
++        for key, value in _gconf_origin_values.items():
++            if value is None:
++                conf.unset(key)
++            else:
++                conf.set(key, value)
++
++    @property
++    def needs_restart(self):
++        conf = gconf.client_get_default()
++        for key, value in _gconf_origin_values.items():
++            if value is None and conf.get_without_default(key) is not None or \
++                    value.to_string() != conf.get(key).to_string():
++                return True
++        else:
++            return False
++
++    @needs_restart.setter
++    def needs_restart(self, value):
++        # needs_restart is fully calculated
++        pass
++
++
++class _ProxySection(gtk.VBox):
++
++    def __init__(self):
++        gtk.VBox.__init__(self)
++        self._common_hosts = {}
++        self._common_ports = {}
++
++        group = gtk.RadioButton()
++        group.props.label = _('Direct internet connection')
++        group.show()
++        self.pack_start(group, expand=False)
++        _register_selector_key('/system/proxy/mode', group, 'none')
++        _register_bool_key('/system/http_proxy/use_http_proxy', group, True)
++
++        manual_proxy = gtk.RadioButton(group)
++        manual_proxy.props.label = _('Manual proxy configuration')
++        manual_proxy.show()
++        self.pack_start(manual_proxy, expand=False)
++        _register_selector_key('/system/proxy/mode', manual_proxy, 'manual')
++
++        widgets = self._add_protos()
++        manual_proxy.connect('toggled', _set_sensitive, False, widgets)
++        _set_sensitive(manual_proxy, False, widgets)
++
++        auto_proxy = gtk.RadioButton(group)
++        auto_proxy.props.label = _('Automatic proxy configuration')
++        auto_proxy.show()
++        self.pack_start(auto_proxy, expand=False)
++        _register_selector_key('/system/proxy/mode', auto_proxy, 'auto')
++
++        grid = self._sub_section_new()
++        grid.attach_label(_('Autofiguration URL:'), 0, 1, 0, 1)
++        entry = grid.attach_entry(1, 2, 0, 1)
++        _register_string_key('/system/proxy/autoconfig_url', entry)
++        auto_proxy.connect('toggled', _set_sensitive, False, [grid])
++        _set_sensitive(auto_proxy, False, [grid])
++
++    def _add_protos(self):
++        commons = gtk.CheckButton()
++        commons.props.label = _('Use the same proxy for all protocols')
++        commons.show()
++        self.pack_start(commons)
++        _register_bool_key('/system/http_proxy/use_same_proxy', commons)
++
++        grid = self._sub_section_new()
++
++        def add_proto(row, is_common, label_text, host_key, port_key):
++            host_label = grid.attach_label(label_text, 0, 1, row, row + 1)
++            host = grid.attach_entry(1, 2, row, row + 1)
++
++            port_label = grid.attach_label(_('Port:'), 2, 3, row, row + 1)
++            port_value = gtk.Adjustment(8080, 0, 65536, 1, 10)
++            port = gtk.SpinButton()
++            port.configure(port_value, .1, 0)
++            port.show()
++            grid.attach(port, 3, 4, row, row + 1,
++                    gtk.SHRINK | gtk.FILL, gtk.SHRINK)
++
++            if is_common:
++                _widget_sensitivies.update([
++                        (host_label, None), (host, None),
++                        (port_label, None), (port, None)])
++                self._common_hosts[host] = host.props.buffer
++                self._common_ports[port] = port.props.adjustment
++
++            _register_string_key(host_key, host)
++            _register_int_key(port_key, port)
++
++            return host, port
++
++        http_host, http_port = add_proto(1, False, _('HTTP proxy:'),
++                '/system/http_proxy/host', '/system/http_proxy/port')
++
++        auth_widget = _AuthWidget()
++        auth_widget.show()
++        grid.attach(auth_widget, 1, 2, 2, 3, gtk.SHRINK | gtk.FILL, gtk.SHRINK)
++
++        add_proto(3, True, _('Secure HTTP proxy:'),
++                '/system/proxy/secure_host', '/system/proxy/secure_port')
++        add_proto(4, True, _('FTP proxy:'),
++                '/system/proxy/ftp_host', '/system/proxy/ftp_port')
++        add_proto(5, True, _('Socks proxy:'),
++                '/system/proxy/socks_host', '/system/proxy/socks_port')
++
++        def commons_toggled_cb(sender):
++            for widget in _widget_sensitivies.keys():
++                _widget_sensitivies[widget] = not sender.props.active
++            _set_sensitive(sender, True, _widget_sensitivies.keys())
++
++            for widget, orig_buffer in self._common_hosts.items():
++                widget.props.buffer = http_host.props.buffer if \
++                        sender.props.active else orig_buffer
++
++            for widget, orig_adjustment in self._common_ports.items():
++                widget.props.adjustment = http_port.props.adjustment if \
++                        sender.props.active else orig_adjustment
++                widget.props.value = widget.props.adjustment.value
++
++        commons.connect('toggled', commons_toggled_cb)
++        commons_toggled_cb(commons)
++
++        return [commons, grid]
++
++    def _sub_section_new(self):
++        grid = _Grid(1, 1, False)
++        grid.props.column_spacing = style.DEFAULT_SPACING
++        grid.props.row_spacing = style.DEFAULT_SPACING
++        grid.show()
++
++        alignment = gtk.Alignment(0, 0, 1, 1)
++        alignment.props.left_padding = style.STANDARD_ICON_SIZE
++        alignment.props.right_padding = style.GRID_CELL_SIZE
++        alignment.add(grid)
++        alignment.show()
++        self.pack_start(alignment)
++
++        return grid
++
++
++class _IgnoreSection(gtk.VBox):
++
++    def __init__(self):
++        gtk.VBox.__init__(self)
++
++        entry = gtk.Entry()
++        entry.show()
++        self.pack_start(entry, expand=False)
++        _register_list_key('/system/http_proxy/ignore_hosts', entry)
++
++
++class _AuthWidget(gtk.VBox):
++
++    def __init__(self):
++        gtk.VBox.__init__(self)
++
++        enable = gtk.CheckButton()
++        enable.props.label = _('Use authentication')
++        enable.show()
++        self.pack_start(enable, expand=False)
++        _register_bool_key('/system/http_proxy/use_authentication', enable)
++
++        grid = _Grid(2, 2, False)
++        grid.props.column_spacing = style.DEFAULT_SPACING
++        grid.props.row_spacing = style.DEFAULT_SPACING
++        self.pack_start(grid)
++
++        grid.attach_label(_('Username:'), 0, 1, 0, 1)
++        entry = grid.attach_entry(1, 2, 0, 1)
++        _register_string_key('/system/http_proxy/authentication_user', entry)
++
++        grid.attach_label(_('Password:'), 0, 1, 1, 2)
++        entry = grid.attach_entry(1, 2, 1, 2)
++        entry.props.visibility = False
++        _register_string_key(
++                '/system/http_proxy/authentication_password', entry)
++
++        enable.connect('toggled', lambda sender:
++                grid.show() if sender.props.active else grid.hide())
++        if enable.props.active:
++            grid.show()
++
++
++class _Grid(gtk.Table):
++
++    def attach_label(self, label, left_attach, right_attach,
++            top_attach, bottom_attach):
++        widget = gtk.Label(label)
++        widget.set_alignment(0, 0)
++        self.attach(widget, left_attach, right_attach,
++                top_attach, bottom_attach, gtk.SHRINK | gtk.FILL, gtk.SHRINK)
++        widget.show()
++        return widget
++
++    def attach_entry(self, left_attach, right_attach,
++            top_attach, bottom_attach):
++        widget = gtk.Entry()
++        self.attach(widget, left_attach, right_attach,
++                top_attach, bottom_attach, gtk.EXPAND | gtk.FILL, gtk.SHRINK)
++        widget.show()
++        return widget
++
++
++def _set_sensitive(sender, reverse, widgets):
++    is_sensitive = sender.props.active
++    if reverse:
++        is_sensitive = not is_sensitive
++
++    for i in widgets:
++        if isinstance(i, gtk.Container):
++            _set_sensitive(sender, reverse, i.get_children())
++        i.props.sensitive = is_sensitive and _widget_sensitivies.get(i, True)
++
++
++def _register_bool_key(key, widget, reverse=False):
++
++    def set_cb(widget, x, reverse):
++        value = x.get_bool()
++        if reverse:
++            value = not value
++        widget.props.active = value
++
++    def get_cb(widget, reverse):
++        x = gconf.Value(gconf.VALUE_BOOL)
++        value = widget.props.active
++        if reverse:
++            value = not value
++        x.set_bool(value)
++        return x
++
++    _register_key(key, widget, 'toggled', set_cb, get_cb, reverse)
++
++
++def _register_string_key(key, widget):
++
++    def set_cb(widget, x):
++        widget.props.text = x.get_string()
++
++    def get_cb(widget):
++        x = gconf.Value(gconf.VALUE_STRING)
++        x.set_string(widget.props.text)
++        return x
++
++    _register_key(key, widget, 'changed', set_cb, get_cb)
++
++
++def _register_int_key(key, widget):
++
++    def set_cb(widget, x):
++        widget.props.value = x.get_int()
++
++    def get_cb(widget):
++        x = gconf.Value(gconf.VALUE_INT)
++        x.set_int(int(widget.props.value))
++        return x
++
++    _register_key(key, widget.props.adjustment, 'value_changed',
++            set_cb, get_cb)
++
++
++def _register_selector_key(key, widget, value):
++
++    def set_cb(widget, x, value):
++        widget.props.active = x.get_string() == value
++
++    def get_cb(widget, value):
++        if not widget.props.active:
++            return None
++        x = gconf.Value(gconf.VALUE_STRING)
++        x.set_string(value)
++        return x
++
++    _register_key(key, widget, 'toggled', set_cb, get_cb, value)
++
++
++def _register_list_key(key, widget):
++
++    def set_cb(widget, x):
++        hosts = [i.get_string() for i in x.get_list()]
++        widget.props.text = ', '.join(hosts)
++
++    def get_cb(widget):
++        hosts = []
++        for i in re.split('[\s,;:]+', widget.props.text or ''):
++            if not i.strip():
++                continue
++            value = gconf.Value(gconf.VALUE_STRING)
++            value.set_string(i.strip())
++            hosts.append(value)
++        x = gconf.Value(gconf.VALUE_LIST)
++        x.set_list_type(gconf.VALUE_STRING)
++        x.set_list(hosts)
++        return x
++
++    _register_key(key, widget, 'changed', set_cb, get_cb)
++
++
++def _register_key(key, widget, signal, set_cb, get_cb, *args):
++    conf = gconf.client_get_default()
++    value = conf.get(key)
++    if value is not None:
++        set_cb(widget, value, *args)
++
++    _gconf_origin_values[key] = value
++
++    def signal_cb(sender, key, widget, get_cb, *args):
++        value = get_cb(widget, *args)
++        if value is not None:
++            conf = gconf.client_get_default()
++            conf.set(key, value)
++
++    widget.connect(signal, signal_cb, key, widget, get_cb, *args)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0066-Localise-sugar-install-bundle.patch b/rpms/sugar/0066-Localise-sugar-install-bundle.patch
new file mode 100644
index 0000000..1ed6b3a
--- /dev/null
+++ b/rpms/sugar/0066-Localise-sugar-install-bundle.patch
@@ -0,0 +1,82 @@
+From ae8677d1cbcfd1cf8a3b4c02be990f23ebc58d3e Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <silbe@activitycentral.com>
+Date: Mon, 5 Sep 2011 15:10:33 +0000
+Subject: [PATCH sugar 66/74] Localise sugar-install-bundle
+
+sugar-install-bundle contains user-visible strings that should be translated.
+
+By default xgettext guesses the programming language based on the file
+extension. Since the scripts in bin/ don't have any extension, we need to tell
+xgettext the source language by explicitly stating it in XGETTEXT_OPTIONS.
+This works because the sugar package only contains Python files.
+
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ bin/sugar-install-bundle |   19 +++++++++++++++----
+ po/Makevars              |    6 +++++-
+ po/POTFILES.in           |    1 +
+ 3 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/bin/sugar-install-bundle b/bin/sugar-install-bundle
+index 52deada..d0b6fc5 100644
+--- a/bin/sugar-install-bundle
++++ b/bin/sugar-install-bundle
+@@ -1,20 +1,31 @@
+ #!/usr/bin/env python
++import gettext
+ import sys
+ 
+ from sugar.bundle.activitybundle import ActivityBundle
+ 
++from jarabe import config
++
+ from dbus.mainloop.glib import DBusGMainLoop
+-DBusGMainLoop(set_as_default=True)
++
+ 
+ def cmd_help():
+-    print 'Usage: sugar-install-bundle [ bundlename ] \n\n\
+-    Install an activity bundle (.xo). \n'
++    print _('Usage: sugar-install-bundle [ bundlename ] \n\n'
++            'Install an activity bundle (.xo). \n')
++
++
++gettext.bindtextdomain('sugar', config.locale_path)
++gettext.bindtextdomain('sugar-toolkit', config.locale_path)
++gettext.textdomain('sugar')
++_ = gettext.gettext
+ 
+ if len(sys.argv) != 2:
+     cmd_help()
+     sys.exit(2)
+ 
++DBusGMainLoop(set_as_default=True)
++
+ bundle = ActivityBundle(sys.argv[1])
+ bundle.install()
+ 
+-print "%s: '%s' installed." % (sys.argv[0], sys.argv[1])
++print _('%s: %r installed.') % (sys.argv[0], sys.argv[1])
+diff --git a/po/Makevars b/po/Makevars
+index da4dba6..d9251f9 100644
+--- a/po/Makevars
++++ b/po/Makevars
+@@ -1 +1,5 @@
+-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_ --keyword=g_dgettext:2 --keyword=g_dngettext:2,3 --keyword=g_dpgettext:2 --keyword=g_dpgettext2=2c,3 --keyword=pgettext:1c,2
++XGETTEXT_OPTIONS = --language=python --keyword=_ --keyword=N_ \
++        --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_ \
++        --keyword=g_dgettext:2 --keyword=g_dngettext:2,3 \
++        --keyword=g_dpgettext:2 --keyword=g_dpgettext2=2c,3 \
++        --keyword=pgettext:1c,2
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index b799339..aa19b58 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,3 +1,4 @@
++bin/sugar-install-bundle
+ extensions/cpsection/aboutme/__init__.py
+ extensions/cpsection/aboutme/model.py
+ extensions/cpsection/aboutme/view.py
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0067-sugar-install-bundle-skip-older-bundles-by-default-a.patch b/rpms/sugar/0067-sugar-install-bundle-skip-older-bundles-by-default-a.patch
new file mode 100644
index 0000000..ac8c967
--- /dev/null
+++ b/rpms/sugar/0067-sugar-install-bundle-skip-older-bundles-by-default-a.patch
@@ -0,0 +1,82 @@
+From 8d4d7de12b2288827b01af64562a6a19194d5761 Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <silbe@activitycentral.com>
+Date: Mon, 5 Sep 2011 15:10:34 +0000
+Subject: [PATCH sugar 67/74] sugar-install-bundle: skip older bundles by
+ default, accept multiple bundles
+
+If the user has already installed a newer version of an activity,
+sugar-install-bundle shouldn't overwrite it. Since there might be cases where
+this is still useful we provide an option to force installing the bundle even
+if it's the same or even an older version.
+
+The changes necessary to parse the CLI options also add back the support for
+installing multiple bundles in one invocation.
+
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+Reviewed-by: James Cameron <quozl@laptop.org>
+---
+ bin/sugar-install-bundle |   34 +++++++++++++++++++++++-----------
+ 1 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/bin/sugar-install-bundle b/bin/sugar-install-bundle
+index d0b6fc5..47b0084 100644
+--- a/bin/sugar-install-bundle
++++ b/bin/sugar-install-bundle
+@@ -1,17 +1,26 @@
+ #!/usr/bin/env python
+ import gettext
++from optparse import OptionParser
+ import sys
+ 
+ from sugar.bundle.activitybundle import ActivityBundle
++from sugar.bundle.bundle import AlreadyInstalledException
+ 
+ from jarabe import config
++from jarabe.model import bundleregistry
+ 
+ from dbus.mainloop.glib import DBusGMainLoop
+ 
+ 
+-def cmd_help():
+-    print _('Usage: sugar-install-bundle [ bundlename ] \n\n'
+-            'Install an activity bundle (.xo). \n')
++def install_bundle(name, force):
++    bundle = ActivityBundle(name)
++    registry = bundleregistry.get_registry()
++    try:
++        registry.install(bundle, force_downgrade=force)
++    except AlreadyInstalledException:
++        print _("%s: %r or newer is already installed") % (sys.argv[0], name)
++    else:
++        print _('%s: %r installed.') % (sys.argv[0], name)
+ 
+ 
+ gettext.bindtextdomain('sugar', config.locale_path)
+@@ -19,13 +28,16 @@ gettext.bindtextdomain('sugar-toolkit', config.locale_path)
+ gettext.textdomain('sugar')
+ _ = gettext.gettext
+ 
+-if len(sys.argv) != 2:
+-    cmd_help()
+-    sys.exit(2)
++parser = OptionParser(usage=_('usage: %prog [options] {bundle}'),
++                      description=_('Install an activity bundle (.xo)'))
++parser.add_option('-f', '--force', dest='force',
++                  help=_("Install bundle even if it isn't newer than"
++                         " what's currently installed"),
++                  action='store_true', default=False)
++options, args = parser.parse_args()
++if not args:
++    parser.error(_('no bundle given'))
+ 
+ DBusGMainLoop(set_as_default=True)
+-
+-bundle = ActivityBundle(sys.argv[1])
+-bundle.install()
+-
+-print _('%s: %r installed.') % (sys.argv[0], sys.argv[1])
++for file_name in args:
++    install_bundle(file_name, options.force)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0068-Partial-fix-for-GSM-connection-time-see-SL-2992.patch b/rpms/sugar/0068-Partial-fix-for-GSM-connection-time-see-SL-2992.patch
new file mode 100644
index 0000000..41d7eb9
--- /dev/null
+++ b/rpms/sugar/0068-Partial-fix-for-GSM-connection-time-see-SL-2992.patch
@@ -0,0 +1,67 @@
+From 6855cd85421cb8879dd75df324dc940339b9f0ee Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <silbe@activitycentral.com>
+Date: Mon, 9 Jan 2012 19:45:38 +0100
+Subject: [PATCH sugar 68/74] (Partial) fix for GSM connection time (see
+ SL#2992)
+
+The connection time has apparently been off by a couple of hours (depending
+on the time zone; see SL#2992 [1]) ever since we had this feature
+(commit f5daf6e).
+
+This patch addresses the most important use case (controlling the GSM
+connection using the Sugar UI) by fixing the time format. If a system
+connection is used and brought up before Sugar starts, connection time
+calculation will still be off; this seems to be unfixable [1].
+
+[1] http://mail.gnome.org/archives/networkmanager-list/2012-January/thread.html#00022
+
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ extensions/deviceicon/network.py |   17 +++++++----------
+ 1 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
+index 234b06b..c70db70 100644
+--- a/extensions/deviceicon/network.py
++++ b/extensions/deviceicon/network.py
+@@ -364,11 +364,10 @@ def add_alert(self, error, suggestion):
+         self.error_description_label.set_text(message)
+         self.error_description_label.show()
+ 
+-    def update_connection_time(self, connection_time=None):
+-        if connection_time is not None:
+-            formatted_time = connection_time.strftime('%H:%M:%S')
+-        else:
+-            formatted_time = '00:00:00'
++    def update_connection_time(self, connection_time=0):
++        """Set the time we have been connected for, in seconds"""
++        formatted_time = time.strftime('%H:%M:%S',
++                                       time.gmtime(connection_time))
+         text = _('Connected for %s') % (formatted_time, )
+         self.props.secondary_text = glib.markup_escape_text(text)
+ 
+@@ -888,8 +887,8 @@ def _update_state(self, state, old_state, reason):
+             connection = network.find_gsm_connection()
+             if connection is not None:
+                 connection.set_connected()
+-                self._connection_timestamp = time.time() - \
+-                        connection.get_settings().connection.timestamp
++                settings = connection.get_settings()
++                self._connection_timestamp = settings.connection.timestamp
+                 self._connection_time_handler = gobject.timeout_add_seconds( \
+                         1, self.__connection_timecount_cb)
+                 self._palette.update_connection_time()
+@@ -932,9 +931,7 @@ def __ppp_stats_changed_cb(self, in_bytes, out_bytes):
+         self._palette.update_stats(in_bytes, out_bytes)
+ 
+     def __connection_timecount_cb(self):
+-        self._connection_timestamp = self._connection_timestamp + 1
+-        connection_time = \
+-            datetime.datetime.fromtimestamp(self._connection_timestamp)
++        connection_time = time.time() - self._connection_timestamp
+         self._palette.update_connection_time(connection_time)
+         return True
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch b/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch
new file mode 100644
index 0000000..abbc34f
--- /dev/null
+++ b/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch
@@ -0,0 +1,47 @@
+From ac10b142b66af9e94decf41cde1aa345ee2cb638 Mon Sep 17 00:00:00 2001
+From: Sascha Silbe <silbe@activitycentral.com>
+Date: Wed, 18 Jan 2012 01:56:22 +0000
+Subject: [PATCH sugar 69/74] Journal detail view: don't choke on invalid
+ 'keep' property (fixes SL#1591)
+
+Properties of data store entries can get corrupted, e.g. due to low level
+crashes or running out of battery (see OLPC#11372 [1] for a real-life
+example). In addition any activity can - accidentally or on purpose - write
+data store entries with arbitrary metadata.
+
+By comparing the 'keep' property as a string we can avoid the ValueError that
+might happen when trying to convert the property value to  an integer.
+
+[1] https://dev.laptop.org/ticket/11372
+
+Reported-by: Gary Martin <garycmartin@googlemail.com>
+Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
+---
+ src/jarabe/journal/expandedentry.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
+index 4e99dc2..03f8cd1 100644
+--- a/src/jarabe/journal/expandedentry.py
++++ b/src/jarabe/journal/expandedentry.py
+@@ -144,7 +144,7 @@ def set_metadata(self, metadata):
+             return
+         self._metadata = metadata
+ 
+-        self._keep_icon.keep = (int(metadata.get('keep', 0)) == 1)
++        self._keep_icon.keep = (str(metadata.get('keep', 0)) == '1')
+ 
+         self._icon = self._create_icon()
+         self._icon_box.clear()
+@@ -419,7 +419,7 @@ def _update_entry(self, needs_update=False):
+         self._update_title_sid = None
+ 
+     def get_keep(self):
+-        return int(self._metadata.get('keep', 0)) == 1
++        return (str(self._metadata.get('keep', 0)) == '1')
+ 
+     def _keep_icon_activated_cb(self, keep_icon):
+         if self.get_keep():
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0070-Add-capability-to-connect-to-WPA-WPA2-Enterprise-Net.patch b/rpms/sugar/0070-Add-capability-to-connect-to-WPA-WPA2-Enterprise-Net.patch
new file mode 100644
index 0000000..bd65b8a
--- /dev/null
+++ b/rpms/sugar/0070-Add-capability-to-connect-to-WPA-WPA2-Enterprise-Net.patch
@@ -0,0 +1,810 @@
+From ac79a08e270d2694c0aae164b77668daa1981512 Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajay@activitycentral.com>
+Date: Thu, 15 Dec 2011 14:55:13 +0000
+Subject: [PATCH sugar 70/74] Add capability to connect to WPA/WPA2-Enterprise
+ Networks.
+
+(Note that this is a consolidated patch, to be applied in full;
+and NOT OVER version-4, version-3, version-2, and version-1 patches).
+
+Enhancements/Fixes of current version (version-5), over version-4 ::
+--------------------------------------------------------------------
+
+a. Fixed the regression - Unable to connect to Unprotected-Wireless-Networks.
+   Catcher :: Anish.
+
+For the record.
+----------------
+Enhancements/Fixes of version-4, over version-3 ::
+--------------------------------------------------
+
+a. Fixing logging statements, and some formatting-changes (Thanks Sascha).
+b. Not passing parameters to NetworkManager, that are not entered (required),
+   as in TTLS- and PEAP-configuration (Thanks Anish).
+
+For the record.
+----------------
+Enhancements/Fixes of version-3, over version-2 ::
+--------------------------------------------------------------------
+
+a. Now, TLS-based-authentication is also supported.
+   -----------------------------------------------
+
+   Thus, now, the following three authentication types are supported :
+   (i)   TTLS
+   (ii)  PEAP
+   (iii) TLS
+
+   Following authentication types are still not supported :
+   (i)   LEAP (actually this may work, but the set-up has not been
+               able to be worked out, and hence, this has not been
+	       verified, even with nm-applet).
+
+b. Journal-Chooser integration.
+   ----------------------------
+
+   This is useful in picking up chooser-entries (especially in case
+   of certificates requirements, like in TLS and TTLS).
+
+For the record.
+----------------
+Enhancements/Fixes of version-2, over version-1 ::
+--------------------------------------------------
+
+a. Network-Autoconnect-Upon-Hibernate-Resume
+   ------------------------------------------
+
+   Fixing the case, when network wouldn't (auto-)come-up,
+   when the XO resumed from hibernation. (Thanks Anish for
+   catching that :-) ).
+   However, there wasn't a problem with auto-connect-on-reboot;
+   it's working fine.
+
+Signed-off-by: Ajay Garg <ajay@activitycentral.com>
+---
+ src/jarabe/desktop/keydialog.py     |  247 +++++++++++++++++++++++++++++++++-
+ src/jarabe/desktop/networkviews.py  |  259 ++++++++++++++++++++++++++++++++++-
+ src/jarabe/journal/objectchooser.py |   19 +++
+ src/jarabe/model/network.py         |   28 +++-
+ 4 files changed, 541 insertions(+), 12 deletions(-)
+
+diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
+index c72f498..d8c8cf9 100644
+--- a/src/jarabe/desktop/keydialog.py
++++ b/src/jarabe/desktop/keydialog.py
+@@ -20,9 +20,13 @@
+ 
+ import gtk
+ import dbus
++import os
++import shutil
+ 
++from sugar import env
+ from jarabe.model import network
+ from jarabe.model.network import Secrets
++from jarabe.journal.objectchooser import ObjectChooser
+ 
+ 
+ IW_AUTH_ALG_OPEN_SYSTEM = 'open'
+@@ -32,6 +36,11 @@
+ WEP_HEX = 2
+ WEP_ASCII = 3
+ 
++SETTING_TYPE_STRING = 1
++SETTING_TYPE_LIST = 2
++SETTING_TYPE_CHOOSER = 3
++
++
+ 
+ def string_is_hex(key):
+     is_hex = True
+@@ -120,6 +129,226 @@ def get_response_object(self):
+         return self._response
+ 
+ 
++class NetworkParameters(gtk.HBox):
++    def __init__(self, auth_param):
++        gtk.HBox.__init__(self, homogeneous=True)
++        self._key = auth_param._key_name
++        self._label = gtk.Label(_(auth_param._key_label))
++        self._key_type = auth_param._key_type
++        self._auth_param = auth_param
++
++        self.pack_start(self._label)
++        self._label.show()
++
++        if self._is_entry():
++            self._entry = gtk.Entry()
++            self.pack_start(self._entry)
++            self._entry.show()
++        elif self._is_liststore():
++            self._option_store = gtk.ListStore(str, str)
++            for option in auth_param._options:
++                self._option_store.append(option)
++
++            self._entry = auth_param._options[0][1]
++            self._option_combo = gtk.ComboBox(self._option_store)
++            cell = gtk.CellRendererText()
++            self._option_combo.pack_start(cell, True)
++            self._option_combo.add_attribute(cell, 'text', 0)
++            self._option_combo.set_active(0)
++            self._option_combo.connect('changed',
++                    self._option_combo_changed_cb)
++            self.pack_start(self._option_combo)
++            self.show()
++            self._option_combo.show()
++        elif self._is_chooser():
++            self._chooser_button = gtk.Button(_('Choose..'))
++            self._chooser_button.connect('clicked',
++                                          self._object_chooser_cb)
++            self.pack_start(self._chooser_button)
++            self._chooser_button.show()
++            self._entry = ''
++
++    def _is_entry(self):
++        return ( not self._is_chooser() ) and \
++               ( len(self._auth_param._options) == 0 )
++
++    def _is_liststore(self):
++        return ( not self._is_chooser() ) and \
++               ( len(self._auth_param._options) > 0 )
++
++    def _is_chooser(self):
++        return self._key_type == SETTING_TYPE_CHOOSER
++
++    def _object_chooser_cb(self, chooser_button):
++        self._want_document = True
++        self._show_picker_cb()
++
++    def _show_picker_cb(self):
++        if not self._want_document:
++            return
++        self._chooser = ObjectChooser()
++        self._chooser._set_callback(self.__process_selected_journal_object)
++
++        self._chooser.show()
++
++    def __process_selected_journal_object(self, object_id):
++        jobject = self._chooser.get_selected_object()
++        if jobject and jobject.file_path:
++            file_basename = \
++                    os.path.basename(jobject._metadata._properties['title'])
++            self._chooser_button.set_label(file_basename)
++
++
++
++            # The chooser entries are chosen from the journal.
++            # Now, the journal entries misbehave, and the entries keep
++            # changing their names. Thus, in order to have the same
++            # entry available at later times, we need to store the
++            # selected entries at a 'fixed-name' place.
++            #
++            # DISCOVERY-CUM-REQUIREMENT:
++            # -------------------------
++            #   It is needed that networks auto-connect on reboot; and
++            #   the user need not ne re-prompted to enter the
++            #   network-parameters.
++
++            profile_path = env.get_profile_path()
++            self._entry = os.path.join(profile_path, 'nm',
++                                       file_basename)
++
++            # Remove (older) file, if it exists.
++            if os.path.exists(self._entry):
++                os.remove(self._entry)
++
++            # Copy the file.
++            shutil.copy2(jobject.file_path, self._entry)
++
++        self._chooser.destroy()
++
++    def _option_combo_changed_cb(self, widget):
++        it = self._option_combo.get_active_iter()
++        (value, ) = self._option_store.get(it, 1)
++        self._entry = value
++
++    def _get_key(self):
++        return self._key
++
++    def _get_value(self):
++        if self._is_entry():
++            return self._entry.get_text()
++        elif self._is_liststore():
++            return self._entry
++        elif self._is_chooser():
++            if len(self._entry) > 0:
++                return dbus.ByteArray('file://' + self._entry + '\0')
++            else:
++                return self._entry
++
++
++class KeyValuesDialog(gtk.Dialog):
++    def __init__(self, auth_lists, final_callback, uuid, settings):
++        # This must not be "modal", else the "chooser" widgets won't
++        # accept anything !!
++        gtk.Dialog.__init__(self)
++        self.set_title(_('Wireless Parameters required'))
++
++        self._spacing_between_children_widgets = 5
++        self._auth_lists = auth_lists
++        self._final_callback = final_callback
++        self._uuid = uuid
++        self._settings = settings
++
++        label = gtk.Label(_("Please enter parameters\n"))
++        self.vbox.set_spacing(self._spacing_between_children_widgets)
++        self.vbox.pack_start(label)
++
++        self._auth_type_store = gtk.ListStore(str, str)
++        for auth_list in self._auth_lists:
++            self._auth_type_store.append([auth_list._auth_label,
++                                          auth_list._auth_type])
++
++        self._auth_type_combo = gtk.ComboBox(self._auth_type_store)
++        cell = gtk.CellRendererText()
++        self._auth_type_combo.pack_start(cell, True)
++        self._auth_type_combo.add_attribute(cell, 'text', 0)
++        self._auth_type_combo.set_active(0)
++        self._auth_type_combo.connect('changed',
++                self._auth_type_combo_changed_cb)
++        self._auth_type_box = gtk.HBox(homogeneous=True)
++        self._auth_label = gtk.Label(_('Authentication'))
++        self._auth_type_box.pack_start(self._auth_label, expand=False)
++        self._auth_type_box.pack_start(self._auth_type_combo,
++                                       expand=False)
++        self.vbox.pack_start(self._auth_type_box)
++        self._auth_label.show()
++        self._auth_type_combo.show()
++
++        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK)
++        self.set_default_response(gtk.RESPONSE_OK)
++        self.set_has_separator(True)
++
++        self.connect('response', self._fetch_values)
++
++        auth_type = self._auth_lists[0]._auth_type
++        self._selected_auth_list = self._select_auth_list(auth_type)
++        self._add_key_value('eap', auth_type)
++        self._add_container_box()
++
++    def _auth_type_combo_changed_cb(self, widget):
++        it = self._auth_type_combo.get_active_iter()
++        (auth_type, ) = self._auth_type_store.get(it, 1)
++        self._selected_auth_list = self._select_auth_list(auth_type)
++        self._add_key_value('eap', auth_type)
++        self._reset()
++
++    def _select_auth_list(self, auth_type):
++        for auth_list in self._auth_lists:
++            if auth_list._params_list[0]._options[0][1] == auth_type:
++                return auth_list
++
++    def _populate_auth_params(self, auth_list):
++        for auth_param in auth_list._params_list[1:]:
++            obj = NetworkParameters(auth_param)
++            self._key_values_box.pack_start(obj)
++            obj.show()
++
++    def _reset(self):
++        self.vbox.remove(self._key_values_box)
++        self._add_container_box()
++
++    def _add_container_box(self):
++        self._key_values_box = \
++                gtk.VBox(spacing=self._spacing_between_children_widgets)
++        self.vbox.pack_start(self._key_values_box)
++        self._key_values_box.show()
++        self._populate_auth_params(self._selected_auth_list)
++
++    def _remove_all_params(self):
++        self._key_values_box.remove_all()
++
++    def _fetch_values(self, key_dialog, response_id):
++        if response_id == gtk.RESPONSE_OK:
++            for child in self._key_values_box.get_children():
++                key = child._get_key()
++                value = child._get_value()
++                self._add_key_value(key, value)
++
++            key_dialog.destroy()
++            self._final_callback(self._uuid, self._settings,
++                                 self._selected_auth_list)
++
++    def _add_key_value(self, key, value):
++        for auth_param in self._selected_auth_list._params_list:
++            if auth_param._key_name == key:
++                if (auth_param._key_type == SETTING_TYPE_STRING) or \
++                   (auth_param._key_type == SETTING_TYPE_CHOOSER):
++                    auth_param._value = value
++                elif auth_param._key_type == SETTING_TYPE_LIST:
++                    values = []
++                    values.append(value)
++                    auth_param._value = values
++
++
+ class WEPKeyDialog(KeyDialog):
+     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, settings,
+                  response):
+@@ -218,7 +447,7 @@ def _update_response_sensitivity(self, ignored=None):
+         self.set_response_sensitive(gtk.RESPONSE_OK, valid)
+ 
+ 
+-class WPAKeyDialog(KeyDialog):
++class WPAPersonalKeyDialog(KeyDialog):
+     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, settings,
+                  response):
+         KeyDialog.__init__(self, ssid, flags, wpa_flags, rsn_flags,
+@@ -296,14 +525,26 @@ def create(ssid, flags, wpa_flags, rsn_flags, dev_caps, settings, response):
+             rsn_flags == network.NM_802_11_AP_SEC_NONE:
+         key_dialog = WEPKeyDialog(ssid, flags, wpa_flags, rsn_flags,
+                                   dev_caps, settings, response)
+-    else:
+-        key_dialog = WPAKeyDialog(ssid, flags, wpa_flags, rsn_flags,
++    elif (wpa_flags & network.NM_802_11_AP_SEC_KEY_MGMT_PSK) or \
++            (rsn_flags & network.NM_802_11_AP_SEC_KEY_MGMT_PSK):
++        key_dialog = WPAPersonalKeyDialog(ssid, flags, wpa_flags, rsn_flags,
+                                   dev_caps, settings, response)
++    elif (wpa_flags & network.NM_802_11_AP_SEC_KEY_MGMT_802_1X) or \
++            (rsn_flags & network.NM_802_11_AP_SEC_KEY_MGMT_802_1X):
++        # nothing. All details are asked for WPA/WPA2-Enterprise
++        # networks, before the conneection-activation is done.
++        return
+ 
+     key_dialog.connect('response', _key_dialog_response_cb)
+     key_dialog.show_all()
+ 
+ 
++def get_key_values(key_list, final_callback, uuid, settings):
++    key_dialog = KeyValuesDialog(key_list, final_callback,
++                                 uuid, settings)
++    key_dialog.show_all()
++
++
+ def _key_dialog_response_cb(key_dialog, response_id):
+     response = key_dialog.get_response_object()
+     secrets = None
+diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py
+index 2fb8593..d36aeb3 100644
+--- a/src/jarabe/desktop/networkviews.py
++++ b/src/jarabe/desktop/networkviews.py
+@@ -22,6 +22,7 @@
+ 
+ import dbus
+ import glib
++import string
+ 
+ from sugar.graphics.icon import Icon
+ from sugar.graphics.xocolor import XoColor
+@@ -56,6 +57,192 @@
+ 
+ _FILTERED_ALPHA = 0.33
+ 
++SETTING_TYPE_STRING = 1
++SETTING_TYPE_LIST = 2
++SETTING_TYPE_CHOOSER = 3
++
++
++class AuthenticationType:
++    def __init__(self, auth_label, auth_type, params_list):
++        self._auth_label = auth_label
++        self._auth_type = auth_type
++        self._params_list = params_list
++
++
++class AuthenticationParameter:
++    def __init__(self, key_name, key_label, key_type,
++                       options):
++        self._key_name = key_name
++        self._key_label = key_label
++        self._key_type = key_type
++        self._options = options
++        self._value = None
++
++
++
++AUTHENTICATION_LIST = \
++        [
++          AuthenticationType('TLS',
++                             'tls',
++                               [
++                                 AuthenticationParameter(
++                                 'eap',
++                                 'Authentication',
++                                  SETTING_TYPE_LIST,
++                                  [['TLS', 'tls']]
++                                  ),
++                                  AuthenticationParameter(
++                                  'identity',
++                                  'Identity',
++                                  SETTING_TYPE_STRING,
++                                  []
++                                  ),
++                                  AuthenticationParameter(
++                                  'client-cert',
++                                  'User certificate',
++                                  SETTING_TYPE_CHOOSER,
++                                  []
++                                  ),
++                                  AuthenticationParameter(
++                                  'ca-cert',
++                                  'CA certificate',
++                                  SETTING_TYPE_CHOOSER,
++                                  []
++                                  ),
++                                  AuthenticationParameter(
++                                  'private-key',
++                                  'Private key',
++                                  SETTING_TYPE_CHOOSER,
++                                  []
++                                  ),
++                                  AuthenticationParameter(
++                                  'private-key-password',
++                                  'Private Key password',
++                                  SETTING_TYPE_STRING,
++                                  []
++                                  )
++                                ]
++                            ),
++          AuthenticationType('LEAP',
++                             'leap',
++                                [
++                                   AuthenticationParameter(
++                                   'eap',
++                                   'Authentication',
++                                   SETTING_TYPE_LIST,
++                                   [['LEAP', 'leap']]
++                                   ),
++                                   AuthenticationParameter(
++                                   'identity',
++                                   'Username',
++                                   SETTING_TYPE_STRING,
++                                   []
++                                   ),
++                                   AuthenticationParameter(
++                                   'password',
++                                   'Password',
++                                   SETTING_TYPE_STRING,
++                                   []
++                                   )
++                                 ]
++                             ),
++           AuthenticationType('Tunnelled TLS',
++                              'ttls',
++                                 [
++                                    AuthenticationParameter(
++                                    'eap',
++                                    'Authentication',
++                                    SETTING_TYPE_LIST,
++                                    [['Tunnelled TLS', 'ttls']]
++                                    ),
++                                    AuthenticationParameter(
++                                    'anonymous-identity',
++                                    'Anonymous identity',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'ca-cert',
++                                    'CA certificate',
++                                    SETTING_TYPE_CHOOSER,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'phase2-auth',
++                                    'Inner Authentication',
++                                    SETTING_TYPE_STRING,
++                                    [['PAP', 'pap'],
++                                    ['MSCHAP', 'mschap'],
++                                    ['MSCHAPv2', 'mschapv2'],
++                                    ['CHAP', 'chap']]
++                                    ),
++                                    AuthenticationParameter(
++                                    'identity',
++                                    'Username',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'password',
++                                    'Password',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    )
++                                ]
++                            ),
++          AuthenticationType('Protected EAP (PEAP)',
++                             'peap',
++                                [
++                                    AuthenticationParameter(
++                                    'eap',
++                                    'Authentication',
++                                    SETTING_TYPE_LIST,
++                                    [['Protected EAP (PEAP)', 'peap']]
++                                    ),
++                                    AuthenticationParameter(
++                                    'anonymous-identity',
++                                    'Anonymous identity',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'ca-cert',
++                                    'CA certificate',
++                                    SETTING_TYPE_CHOOSER,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'phase1-peapver',
++                                    'PEAP version',
++                                    SETTING_TYPE_STRING,
++                                    [['Automatic', ''],
++                                    ['Version 0', '0'],
++                                    ['Version 1', '1']]
++                                    ),
++                                    AuthenticationParameter(
++                                    'phase2-auth',
++                                    'Inner Authentication',
++                                    SETTING_TYPE_STRING,
++                                    [['MSCHAPv2', 'mschapv2'],
++                                    ['MD5', 'md5'],
++                                    ['GTC', 'gtc']]
++                                    ),
++                                    AuthenticationParameter(
++                                    'identity',
++                                    'Username',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    ),
++                                    AuthenticationParameter(
++                                    'password',
++                                    'Password',
++                                    SETTING_TYPE_STRING,
++                                    []
++                                    )
++                                 ]
++                            )
++             ]
++
+ 
+ class WirelessNetworkView(CanvasPulsingIcon):
+     def __init__(self, initial_ap):
+@@ -323,7 +510,7 @@ def _get_security(self):
+             group = self._add_ciphers_from_flags(self._rsn_flags, False)
+             wireless_security = WirelessSecurity()
+             wireless_security.key_mgmt = 'wpa-psk'
+-            wireless_security.proto = 'rsn'
++            wireless_security.proto = ['rsn']
+             wireless_security.pairwise = pairwise
+             wireless_security.group = group
+             return wireless_security
+@@ -335,11 +522,71 @@ def _get_security(self):
+             group = self._add_ciphers_from_flags(self._wpa_flags, False)
+             wireless_security = WirelessSecurity()
+             wireless_security.key_mgmt = 'wpa-psk'
+-            wireless_security.proto = 'wpa'
++            wireless_security.proto = ['wpa']
+             wireless_security.pairwise = pairwise
+             wireless_security.group = group
+             return wireless_security
+ 
++        if (self._rsn_flags & network.NM_802_11_AP_SEC_KEY_MGMT_802_1X) and \
++                (self._device_caps & network.NM_802_11_DEVICE_CAP_RSN):
++            # WPA2 Enterprise
++            pairwise = self._add_ciphers_from_flags(self._rsn_flags, True)
++            group = self._add_ciphers_from_flags(self._rsn_flags, False)
++            wireless_security = WirelessSecurity()
++            wireless_security.key_mgmt = 'wpa-eap'
++            wireless_security.proto = ['rsn']
++            wireless_security.pairwise = pairwise
++            wireless_security.group = group
++            return wireless_security
++
++        if (self._wpa_flags & network.NM_802_11_AP_SEC_KEY_MGMT_802_1X) and \
++                (self._device_caps & network.NM_802_11_DEVICE_CAP_WPA):
++            # WPA Enterprise
++            pairwise = self._add_ciphers_from_flags(self._wpa_flags, True)
++            group = self._add_ciphers_from_flags(self._wpa_flags, False)
++            wireless_security = WirelessSecurity()
++            wireless_security.key_mgmt = 'wpa-eap'
++            wireless_security.proto = ['wpa']
++            wireless_security.pairwise = pairwise
++            wireless_security.group = group
++            return wireless_security
++
++    def _enter_additional_settings_and_secrets_and_then_activate(self,
++            uuid, settings, wireless_security):
++        # this is valid, only for "ieee8021x" or "wpa-eap" key
++        # management (provided the network has ANY security at all)
++        if (wireless_security is not None) and \
++                ( (wireless_security.key_mgmt == 'ieee8021x') or \
++                  (wireless_security.key_mgmt == 'wpa-eap') ):
++            keydialog.get_key_values(AUTHENTICATION_LIST,
++                                     self.__add_and_activate_connection,
++                                     uuid, settings)
++        else:
++            self.__add_and_activate_connection(uuid, settings)
++
++    def __add_and_activate_connection(self, uuid, settings,
++                                      additional_settings=None):
++
++        if additional_settings is not None:
++            key_value_dict = {}
++            auth_params_list = additional_settings._params_list
++
++            for auth_param in auth_params_list:
++                key = auth_param._key_name
++                value = auth_param._value
++                logging.debug('key == %s', key)
++                logging.debug('value == %s', value)
++                if len(value) > 0:
++                    key_value_dict[key] = value
++                else:
++                    logging.debug('Not setting empty value for key :'
++                    ' %s', key)
++
++            settings.wpa_eap_setting = key_value_dict
++
++        connection = network.add_connection(uuid, settings)
++        self._activate_connection(connection)
++
+     def __connect_activate_cb(self, icon):
+         self._connect()
+ 
+@@ -350,8 +597,10 @@ def _connect(self):
+         connection = network.find_connection_by_ssid(self._name)
+         if connection is None:
+             settings = Settings()
++            self._settings = settings
+             settings.connection.id = 'Auto ' + self._name
+             uuid = settings.connection.uuid = unique_id()
++            self._uuid = uuid
+             settings.connection.type = '802-11-wireless'
+             settings.wireless.ssid = self._name
+ 
+@@ -370,8 +619,12 @@ def _connect(self):
+             if wireless_security is not None:
+                 settings.wireless.security = '802-11-wireless-security'
+ 
+-            connection = network.add_connection(uuid, settings)
++            self._enter_additional_settings_and_secrets_and_then_activate(uuid,
++                    settings, wireless_security)
++        else:
++            self._activate_connection(connection)
+ 
++    def _activate_connection(self, connection):
+         obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
+         netmgr = dbus.Interface(obj, _NM_IFACE)
+ 
+diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py
+index ecb8ecf..59df14b 100644
+--- a/src/jarabe/journal/objectchooser.py
++++ b/src/jarabe/journal/objectchooser.py
+@@ -20,9 +20,12 @@
+ import gobject
+ import gtk
+ import wnck
++import os
+ 
++from sugar import env
+ from sugar.graphics import style
+ from sugar.graphics.toolbutton import ToolButton
++from sugar.datastore import datastore
+ 
+ from jarabe.journal.listview import BaseListView
+ from jarabe.journal.listmodel import ListModel
+@@ -46,6 +49,7 @@ def __init__(self, parent=None, what_filter=''):
+         self.set_border_width(style.LINE_WIDTH)
+ 
+         self._selected_object_id = None
++        self._callback = None
+ 
+         self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK)
+         self.connect('visibility-notify-event',
+@@ -109,6 +113,15 @@ def __entry_activated_cb(self, list_view, uid):
+         self._selected_object_id = uid
+         self.emit('response', gtk.RESPONSE_ACCEPT)
+ 
++        if self._callback is not None:
++            self._callback(self._selected_object_id)
++
++    def get_selected_object(self):
++        if self._selected_object_id is None:
++            return None
++        else:
++            return datastore.get(self._selected_object_id)
++
+     def __delete_event_cb(self, chooser, event):
+         self.emit('response', gtk.RESPONSE_DELETE_EVENT)
+ 
+@@ -120,6 +133,9 @@ def __key_press_event_cb(self, widget, event):
+     def __close_button_clicked_cb(self, button):
+         self.emit('response', gtk.RESPONSE_DELETE_EVENT)
+ 
++        if self._callback is not None:
++            self._callback(self._selected_object_id)
++
+     def get_selected_object_id(self):
+         return self._selected_object_id
+ 
+@@ -135,6 +151,9 @@ def __visibility_notify_event_cb(self, window, event):
+         visible = event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED
+         self._list_view.set_is_visible(visible)
+ 
++    def _set_callback(self, callback):
++        self._callback = callback
++
+ 
+ class TitleBox(VolumesToolbar):
+     __gtype_name__ = 'TitleBox'
+diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
+index f265ae4..84e3666 100644
+--- a/src/jarabe/model/network.py
++++ b/src/jarabe/model/network.py
+@@ -418,6 +418,7 @@ def __init__(self, wireless_cfg=None):
+         self.connection = Connection()
+         self.ip4_config = None
+         self.wireless_security = None
++        self.wpa_eap_setting = None
+ 
+         if wireless_cfg is not None:
+             self.wireless = wireless_cfg
+@@ -433,6 +434,10 @@ def get_dict(self):
+                 self.wireless_security.get_dict()
+         if self.ip4_config is not None:
+             settings['ipv4'] = self.ip4_config.get_dict()
++        if self.wpa_eap_setting is not None:
++            settings['802-1x'] = self.wpa_eap_setting
++
++
+         return settings
+ 
+ 
+@@ -653,6 +658,9 @@ def save(self):
+                 if self._settings.wireless.security is not None:
+                     config.set(identifier, 'security',
+                                self._settings.wireless.security)
++                if self._settings.wpa_eap_setting is not None:
++                    config.set(identifier, 'wpa_eap_setting',
++                               self._settings.wpa_eap_setting)
+             if self._secrets is not None:
+                 if self._settings.wireless_security.key_mgmt == 'none':
+                     config.set(identifier, 'key', self._secrets.wep_key)
+@@ -895,21 +903,29 @@ def load_wifi_connections():
+                 settings.wireless_security.key_mgmt = mgmt
+                 security = config.get(section, 'security')
+                 settings.wireless.security = security
+-                key = config.get(section, 'key')
+                 if mgmt == 'none':
++                    key = config.get(section, 'key')
+                     secrets.wep_key = key
+                     auth_alg = config.get(section, 'auth-alg')
+                     secrets.auth_alg = auth_alg
+-                elif mgmt == 'wpa-psk':
+-                    secrets.psk = key
++                elif (mgmt == 'wpa-psk') or (mgmt == 'wpa-eap'):
++                    if mgmt == 'wpa-psk':
++                        key = config.get(section, 'key')
++                        secrets.psk = key
++                    elif mgmt == 'wpa-eap':
++                        if config.has_option(section,
++                                             'wpa_eap_setting'):
++                            value = eval(config.get(section,
++                                               'wpa_eap_setting'))
++                            settings.wpa_eap_setting = value
+                     if config.has_option(section, 'proto'):
+-                        value = config.get(section, 'proto')
++                        value = eval(config.get(section, 'proto'))
+                         settings.wireless_security.proto = value
+                     if config.has_option(section, 'group'):
+-                        value = config.get(section, 'group')
++                        value = eval(config.get(section, 'group'))
+                         settings.wireless_security.group = value
+                     if config.has_option(section, 'pairwise'):
+-                        value = config.get(section, 'pairwise')
++                        value = eval(config.get(section, 'pairwise'))
+                         settings.wireless_security.pairwise = value
+         except ConfigParser.Error:
+             logging.exception('Error reading section')
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0071-Connecting-to-Hidden-Wireless-Networks.patch b/rpms/sugar/0071-Connecting-to-Hidden-Wireless-Networks.patch
new file mode 100644
index 0000000..66eaae2
--- /dev/null
+++ b/rpms/sugar/0071-Connecting-to-Hidden-Wireless-Networks.patch
@@ -0,0 +1,310 @@
+From e613f8448e146c6cb2d1db5d2542f24fdd5c9ee9 Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajay@activitycentral.com>
+Date: Thu, 15 Dec 2011 14:30:49 +0530
+Subject: [PATCH sugar 71/74] Connecting to Hidden-Wireless-Networks.
+
+Signed-off-by: Ajay Garg <ajay@activitycentral.com>
+---
+ extensions/cpsection/network/model.py |   48 +++++++++
+ extensions/cpsection/network/view.py  |  182 +++++++++++++++++++++++++++++++++
+ 2 files changed, 230 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py
+index 916ce8c..9592fdd 100644
+--- a/extensions/cpsection/network/model.py
++++ b/extensions/cpsection/network/model.py
+@@ -18,6 +18,9 @@
+ import dbus
+ from gettext import gettext as _
+ import gconf
++import os
++import subprocess
++import logging
+ 
+ from jarabe.model import network
+ 
+@@ -27,7 +30,9 @@
+ _NM_IFACE = 'org.freedesktop.NetworkManager'
+ 
+ KEYWORDS = ['network', 'jabber', 'radio', 'server']
++HIDDEN_SSID_FILE = os.path.expanduser('~/.sugar/default/nm/hidden_ssid')
+ 
++_logger = logging.getLogger('ControlPanel - Network')
+ 
+ class ReadError(Exception):
+     def __init__(self, value):
+@@ -142,3 +147,46 @@ def set_publish_information(value):
+     client = gconf.client_get_default()
+     client.set_bool('/desktop/sugar/collaboration/publish_gadget', value)
+     return 0
++
++
++def is_hidden_network_connect_package_available():
++    if os.path.exists('/etc/init.d/z-sugar-hidden-network-connect'):
++        return True
++    return False
++
++
++def get_ssids():
++    ssids = []
++
++    # If the file does not exist, return.
++    if not os.path.exists(HIDDEN_SSID_FILE):
++        return ssids
++
++    f = open(HIDDEN_SSID_FILE, 'r')
++    for ssid in f.readlines():
++        ssids.append(ssid.rstrip('\n'))
++    f.close()
++
++    return ssids
++
++
++def set_ssids(ssids):
++
++    # First remove the old ssid-file, if it exists.
++    if os.path.exists(HIDDEN_SSID_FILE):
++        try:
++            os.remove(HIDDEN_SSID_FILE)
++        except:
++            _logger.exception('Error removing file.')
++            return
++
++    # Do nothing and return, if the values-list is empty
++    if len(ssids) == 0:
++        return
++
++    # If we reach here, we have a non-empty ssid-values-list.
++    f = open(HIDDEN_SSID_FILE, 'w')
++    for ssid in ssids:
++        if len(ssid) > 0:
++            f.write(ssid + '\n')
++    f.close()
+diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
+index 381dcb6..9a2444a 100644
+--- a/extensions/cpsection/network/view.py
++++ b/extensions/cpsection/network/view.py
+@@ -19,6 +19,8 @@
+ from gettext import gettext as _
+ 
+ from sugar.graphics import style
++from sugar.graphics.alert import Alert
++from sugar.graphics.icon import Icon
+ 
+ from jarabe.controlpanel.sectionview import SectionView
+ from jarabe.controlpanel.inlinealert import InlineAlert
+@@ -30,6 +32,123 @@
+ 
+ _APPLY_TIMEOUT = 3000
+ 
++class AddRemoveWidget(gtk.HBox):
++
++    def __init__(self, label, add_button_clicked_cb,
++                 remove_button_clicked_cb, index):
++        gtk.Box.__init__(self)
++        self.set_homogeneous(False)
++        self.set_spacing(10)
++
++        self._index = index
++        self._add_button_added = False
++        self._remove_button_added = False
++
++        self._entry_box = gtk.Entry()
++        self._entry_box.set_text(label)
++        self.pack_start(self._entry_box, expand=False)
++        self._entry_box.show()
++
++        add_icon = Icon(icon_name='list-add')
++        self._add_button = gtk.Button()
++        self._add_button.set_image(add_icon)
++        self._add_button.connect('clicked',
++                                 add_button_clicked_cb,
++                                 self)
++
++        remove_icon = Icon(icon_name='list-remove')
++        self._remove_button = gtk.Button()
++        self._remove_button.set_image(remove_icon)
++        self._remove_button.connect('clicked',
++                                    remove_button_clicked_cb,
++                                    self)
++
++        self.__add_add_button()
++        self.__add_remove_button()
++
++    def _get_index(self):
++        return self._index
++
++    def _set_index(self, value):
++        self._index = value
++
++    def _get_entry(self):
++        return self._entry_box.get_text()
++
++    def __add_add_button(self):
++        self.pack_start(self._add_button, expand=False)
++        self._add_button.show()
++        self._add_button_added = True
++
++    def _remove_remove_button_if_not_already(self):
++        if self._remove_button_added:
++            self.__remove_remove_button()
++
++    def __remove_remove_button(self):
++        self.remove(self._remove_button)
++        self._remove_button_added = False
++
++    def _add_remove_button_if_not_already(self):
++        if not self._remove_button_added:
++            self.__add_remove_button()
++
++    def __add_remove_button(self):
++        self.pack_start(self._remove_button, expand=False)
++        self._remove_button.show()
++        self._remove_button_added = True
++
++
++class MultiWidget(gtk.VBox):
++
++    def __init__(self):
++        gtk.VBox.__init__(self)
++
++    def _add_widget(self, label):
++        new_widget = AddRemoveWidget(label,
++                                     self.__add_button_clicked_cb,
++                                     self.__remove_button_clicked_cb,
++                                     len(self.get_children()))
++        self.add(new_widget)
++        new_widget.show()
++        self.show()
++        self._update_remove_button_statuses()
++
++    def __add_button_clicked_cb(self, add_button,
++                                      add_button_container):
++        self._add_widget('')
++        self._update_remove_button_statuses()
++
++    def __remove_button_clicked_cb(self, remove_button,
++                                   remove_button_container):
++        for child in self.get_children():
++            if child._get_index() > remove_button_container._get_index():
++                child._set_index(child._get_index() - 1)
++
++        self.remove(remove_button_container)
++        self._update_remove_button_statuses()
++
++    def _update_remove_button_statuses(self):
++        children = self.get_children()
++
++        # Now, if there is only one entry, remove-button
++        # should not be shown.
++        if len(children) == 1:
++            children[0]._remove_remove_button_if_not_already()
++
++        # Alternatively, if there are more than 1 entries,
++        # remove-button should be shown for all.
++        if len(children) > 1:
++            for child in children:
++                child._add_remove_button_if_not_already()
++
++
++    def _get_entries(self):
++        entries = []
++        for child in self.get_children():
++            entries.append(child._get_entry())
++
++        return entries
++
+ 
+ class Network(SectionView):
+     def __init__(self, model, alerts):
+@@ -50,6 +169,7 @@ def __init__(self, model, alerts):
+ 
+         self._radio_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+         self._jabber_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
++        self._hidden_network_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+ 
+         workspace = gtk.VBox()
+         workspace.show()
+@@ -171,6 +291,55 @@ def __init__(self, model, alerts):
+         workspace.pack_start(box_mesh, expand=False)
+         box_mesh.show()
+ 
++        if self._model.is_hidden_network_connect_package_available():
++            separator_hidden_network = gtk.HSeparator()
++            workspace.pack_start(separator_hidden_network, False)
++            separator_hidden_network.show()
++
++            label_hidden_network = gtk.Label(_('Hidden Networks'))
++            label_hidden_network.set_alignment(0, 0)
++            workspace.pack_start(label_hidden_network, expand=False)
++            label_hidden_network.show()
++            box_hidden_network = gtk.VBox()
++            box_hidden_network.set_border_width(style.DEFAULT_SPACING * 2)
++            box_hidden_network.set_spacing(style.DEFAULT_SPACING)
++
++            info = gtk.Label(_("Enter the SSIDs of the hidden networks."))
++            info.set_alignment(0, 0)
++            info.set_line_wrap(True)
++            box_hidden_network.pack_start(info, expand=False)
++            info.show()
++
++            self._hidden_network_alert = InlineAlert()
++            self.hidden_network_msg = 'XO-reboot is required for the' \
++                                      ' changes to take effect.'
++            self._hidden_network_alert.props.msg =_(self.hidden_network_msg)
++            self._hidden_network_alert_box.pack_start(self._hidden_network_alert,
++                                                        expand=False)
++            box_hidden_network.pack_end(self._hidden_network_alert_box,
++                                                expand=False)
++            self._hidden_network_alert_box.show()
++            self._hidden_network_alert.show()
++
++            self._widget_table = MultiWidget()
++            box_hidden_network.pack_start(self._widget_table, expand=False)
++            self._widget_table.show()
++
++            save_button = gtk.Button()
++            save_button.set_alignment(0, 0)
++            save_button.set_label('Save')
++            save_button.connect('clicked', self.__save_button_clicked_cb)
++            box_save_button = gtk.HBox()
++            box_save_button.set_homogeneous(False)
++            box_save_button.pack_start(save_button, expand=False)
++            save_button.show()
++
++            box_hidden_network.pack_start(box_save_button, expand=False)
++            box_save_button.show()
++
++            workspace.pack_start(box_hidden_network, expand=False)
++            box_hidden_network.show()
++
+         scrolled = gtk.ScrolledWindow()
+         scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+         scrolled.add_with_viewport(workspace)
+@@ -200,6 +369,15 @@ def setup(self):
+                 self._clear_history_button.connect( \
+                         'clicked', self.__network_configuration_reset_cb)
+ 
++        if self._model.is_hidden_network_connect_package_available():
++
++            ssids = self._model.get_ssids()
++            if len(ssids) == 0:
++                self._widget_table._add_widget('')
++            else:
++                for ssid in ssids:
++                    self._widget_table._add_widget(ssid)
++
+     def undo(self):
+         self._button.disconnect(self._radio_change_handler)
+         self._entry.disconnect(self._jabber_change_handler)
+@@ -259,3 +437,7 @@ def __network_configuration_reset_cb(self, widget):
+         self._model.clear_networks()
+         if not self._model.have_networks():
+             self._clear_history_button.set_sensitive(False)
++
++    def __save_button_clicked_cb(self, save_button):
++        self._model.set_ssids(self._widget_table._get_entries())
++        save_button.set_sensitive(False)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0072-Remove-AC-microformat-updater-files.patch b/rpms/sugar/0072-Remove-AC-microformat-updater-files.patch
new file mode 100644
index 0000000..018234f
--- /dev/null
+++ b/rpms/sugar/0072-Remove-AC-microformat-updater-files.patch
@@ -0,0 +1,1153 @@
+From 62e7e4dbb3c0e2fc4b1eccbd163bc4ca779399f0 Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@activitycentral.com>
+Date: Wed, 14 Dec 2011 18:31:30 +0530
+Subject: [PATCH sugar 72/74] Remove AC microformat updater files
+
+Dextrose now uses the out-of-tree microformat updater from OLPC.
+---
+ data/icons/Makefile.am                             |    1 -
+ data/icons/module-updater.svg                      |   16 -
+ extensions/cpsection/Makefile.am                   |    1 -
+ extensions/cpsection/updater/Makefile.am           |    8 -
+ extensions/cpsection/updater/__init__.py           |   22 --
+ extensions/cpsection/updater/backends/Makefile.am  |    5 -
+ extensions/cpsection/updater/backends/__init__.py  |   16 -
+ .../cpsection/updater/backends/microformat.py      |  203 ----------
+ extensions/cpsection/updater/model.py              |  383 -------------------
+ extensions/cpsection/updater/view.py               |  398 --------------------
+ 10 files changed, 0 insertions(+), 1053 deletions(-)
+ delete mode 100644 data/icons/module-updater.svg
+ delete mode 100644 extensions/cpsection/updater/Makefile.am
+ delete mode 100644 extensions/cpsection/updater/__init__.py
+ delete mode 100644 extensions/cpsection/updater/backends/Makefile.am
+ delete mode 100644 extensions/cpsection/updater/backends/__init__.py
+ delete mode 100644 extensions/cpsection/updater/backends/microformat.py
+ delete mode 100755 extensions/cpsection/updater/model.py
+ delete mode 100644 extensions/cpsection/updater/view.py
+
+diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
+index 2582c31..8e01626 100644
+--- a/data/icons/Makefile.am
++++ b/data/icons/Makefile.am
+@@ -11,7 +11,6 @@ sugar_DATA =                        \
+ 	module-modemconfiguration.svg	\
+ 	module-network.svg              \
+ 	module-power.svg                \
+-	module-updater.svg		\
+ 	module-proxy.svg
+ 
+ EXTRA_DIST = $(sugar_DATA)
+diff --git a/data/icons/module-updater.svg b/data/icons/module-updater.svg
+deleted file mode 100644
+index a521f61..0000000
+--- a/data/icons/module-updater.svg
++++ /dev/null
+@@ -1,16 +0,0 @@
+-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+-	<!ENTITY stroke_color "#000">
+-	<!ENTITY fill_color "#fff">
+-]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+- <g>
+-  <g>
+-   <path d="M 31.752 7.088 C 41.935 9.118 49.609 18.107 49.609 28.887 C 49.609 41.173 39.65 51.129 27.374 51.129 C 15.086 51.129 5.133 41.173 5.133 28.887 C 5.133 19.648 10.768 11.723 18.801 8.365 " fill="none" stroke="&fill_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" />
+-   <path d="M 36.134 15.154 L 31.752 7.088 L 40.439 4.13 " fill="none" stroke="&fill_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" />
+-  </g>
+-  <g>
+-   <g>
+-    <path d="M 38.57 25.886 C 37.597 25.886 36.718 26.282 36.082 26.918 L 31.021 31.979 L 31.02 17.022 C 31.018 16.124 30.675 15.221 29.99 14.533 C 28.613 13.159 26.383 13.159 25.01 14.533 C 24.321 15.222 23.98 16.122 23.979 17.023 L 23.977 31.978 L 18.918 26.918 C 18.281 26.281 17.4 25.886 16.429 25.887 C 14.484 25.885 12.908 27.465 12.908 29.408 C 12.907 30.381 13.304 31.263 13.936 31.899 L 27.5 45.463 L 41.062 31.898 C 41.697 31.262 42.09 30.382 42.093 29.41 C 42.094 27.463 40.516 25.885 38.57 25.886 Z " fill="&fill_color;" stroke="none" />
+-   </g>
+-  </g>
+- </g>
+-</svg>
+diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
+index 78d548b..2074d11 100644
+--- a/extensions/cpsection/Makefile.am
++++ b/extensions/cpsection/Makefile.am
+@@ -9,7 +9,6 @@ SUBDIRS = \
+ 	modemconfiguration \
+ 	network \
+ 	power \
+-	updater \
+ 	proxy \
+ 	#
+ 
+diff --git a/extensions/cpsection/updater/Makefile.am b/extensions/cpsection/updater/Makefile.am
+deleted file mode 100644
+index 897dbf3..0000000
+--- a/extensions/cpsection/updater/Makefile.am
++++ /dev/null
+@@ -1,8 +0,0 @@
+-SUBDIRS = backends
+-
+-sugardir = $(pkgdatadir)/extensions/cpsection/updater
+-
+-sugar_PYTHON = 		\
+-	__init__.py	\
+-	model.py	\
+-	view.py		
+diff --git a/extensions/cpsection/updater/__init__.py b/extensions/cpsection/updater/__init__.py
+deleted file mode 100644
+index 6010615..0000000
+--- a/extensions/cpsection/updater/__init__.py
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# Copyright (C) 2008, OLPC
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+-
+-from gettext import gettext as _
+-
+-CLASS = 'ActivityUpdater'
+-ICON = 'module-updater'
+-TITLE = _('Software update')
+-KEYWORDS = ['software', 'activity', 'update']
+diff --git a/extensions/cpsection/updater/backends/Makefile.am b/extensions/cpsection/updater/backends/Makefile.am
+deleted file mode 100644
+index e9c1284..0000000
+--- a/extensions/cpsection/updater/backends/Makefile.am
++++ /dev/null
+@@ -1,5 +0,0 @@
+-sugardir = $(pkgdatadir)/extensions/cpsection/updater/backends
+-
+-sugar_PYTHON = 		\
+-	microformat.py	\
+-	__init__.py
+diff --git a/extensions/cpsection/updater/backends/__init__.py b/extensions/cpsection/updater/backends/__init__.py
+deleted file mode 100644
+index 0dd0174..0000000
+--- a/extensions/cpsection/updater/backends/__init__.py
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#!/usr/bin/python
+-# Copyright (C) 2009, Sugar Labs
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py
+deleted file mode 100644
+index ca4f1d5..0000000
+--- a/extensions/cpsection/updater/backends/microformat.py
++++ /dev/null
+@@ -1,203 +0,0 @@
+-#!/usr/bin/python
+-#
+-# Copyright (C) 2011, Anish Mangal <anish@sugarlabs.org>
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+-
+-import logging
+-from HTMLParser import HTMLParser
+-import urllib
+-import re
+-
+-import gio
+-import gobject
+-import gconf
+-
+-from jarabe import config
+-
+-client = gconf.client_get_default()
+-_UPDATE_PATH = client.get_string('/desktop/sugar/updater_url')
+-_ACTIVITIES_LIST = {}
+-ACTION_CHECKING = 0
+-ACTION_UPDATING = 1
+-ACTION_DOWNLOADING = 2
+-
+-class MicroformatParser(HTMLParser):
+-
+-    def __init__(self, data, completion_cb):
+-        HTMLParser.__init__(self)
+-        self.reset()
+-        self._data_to_parse = data
+-        self._activity_id = ''
+-        self._activity_url = ''
+-        self._activity_version = ''
+-        self._activity_size = 1
+-        self._activity_name = ''
+-        self._inside_activity_block = False
+-        self._inside_activity_version = False
+-        self._inside_activity_id = False
+-        self._inside_activity_url = False
+-        self._inside_activity_size = False
+-        self._inside_activity_name = False
+-        self._activity_block_tag = ''
+-        self._completion_cb = completion_cb
+-
+-    def parse(self):
+-        self.feed(self._data_to_parse)
+-
+-    def handle_endtag(self, tag):
+-        if tag == self._activity_block_tag and self._inside_activity_block:
+-            self._inside_activity_block = False
+-
+-            _ACTIVITIES_LIST[self._activity_id] = \
+-                    {'version':self._activity_version,
+-                            'url':self._activity_url,
+-                            'size':self._activity_size,
+-                            'name':self._activity_name}
+-
+-        elif tag == 'a':
+-            if self._inside_activity_url:
+-                self._inside_activity_url = False
+-
+-        elif tag == 'body':
+-            num_bundles = len(_ACTIVITIES_LIST)
+-            progress = num_bundles
+-            for bundle, info in _ACTIVITIES_LIST.items():
+-                progress = progress + 1
+-                if _ACTIVITIES_LIST[bundle]['size'] == 1:
+-                    try:
+-                        _ACTIVITIES_LIST[bundle]['size'] = \
+-                            gio.File(_ACTIVITIES_LIST[bundle]['url']).\
+-                            query_info('*').get_size()
+-
+-                    except Exception, e:
+-                        logging.exception(e)
+-
+-                    if _ACTIVITIES_LIST[bundle]['size'] == 0:
+-                        logging.error('Size of activity %s reported as '
+-                                '0 bytes. Excluding from update list' % bundle)
+-                        del _ACTIVITIES_LIST[bundle]
+-
+-                    elif _ACTIVITIES_LIST[bundle]['name'] == '':
+-                        # Do some regex magic to get the 'probable'
+-                        # activity name.
+-                        activity_name = re.split('\.',
+-                                bundle)[-1]
+-                        activity_name = re.sub('^[\s|\t]*', '',
+-                                activity_name)
+-                        activity_name = re.sub('[\s|\t]*$', '',
+-                                activity_name)
+-                        activity_name = re.sub('[A|a]ctivity$', '',
+-                                activity_name)
+-                        _ACTIVITIES_LIST[bundle]['name'] = \
+-                                activity_name
+-
+-            self._completion_cb(_ACTIVITIES_LIST, None)
+-
+-    def handle_starttag(self, tag, attrs):
+-        for attribute, value in attrs:
+-            if value == 'olpc-activity-info':
+-                self._inside_activity_block = True
+-                self._activity_block_tag = tag
+-
+-        if tag == 'span':
+-            for attribute, value in attrs:
+-                if value == 'olpc-activity-id':
+-                    self._inside_activity_id = True
+-                elif value == 'olpc-activity-version':
+-                    self._inside_activity_version = True
+-                elif value == 'olpc-activity-name':
+-                    self._inside_activity_name = True
+-                elif value == 'olpc-activity-size':
+-                    self._inside_activity_size = True
+-                elif value == 'olpc-activity-url':
+-                    self._inside_activity_url = True
+-
+-        elif tag == 'a':
+-            if self._inside_activity_url:
+-                for attribute, value in attrs:
+-                    if attribute == 'href':
+-                        self._activity_url = value
+-
+-    def handle_data(self, data):
+-        if self._inside_activity_version:
+-            self._activity_version = str(data)
+-            self._inside_activity_version = False
+-
+-        elif self._inside_activity_id:
+-            self._activity_id = data
+-            self._inside_activity_id = False
+-
+-        elif self._inside_activity_name:
+-            self._activity_name = data
+-            self._inside_activity_name = False
+-
+-        elif self._inside_activity_size:
+-            self._activity_size = int(data)
+-            self._inside_activity_size = False
+-
+-class _UpdateFetcher(gobject.GObject):
+-
+-    __gsignals__ = {
+-        'progress': (gobject.SIGNAL_RUN_FIRST,
+-                     gobject.TYPE_NONE,
+-                     ([int, str, float, int])),
+-    }
+-
+-    def __init__(self, completion_cb):
+-        gobject.GObject.__init__(self)
+-        # ASLO knows only about stable SP releases
+-        major, minor = config.version.split('.')[0:2]
+-        sp_version = '%s.%s' % (major, int(minor) + int(minor) % 2)
+-        self._data = ''
+-        self._completion_cb = completion_cb
+-
+-    def download_bundle_updates(self):
+-        self.emit('progress', ACTION_CHECKING, 'Fetching update '
+-                'information', 1, 3)
+-        self._url = _UPDATE_PATH
+-        self._file = gio.File(self._url)
+-        logging.debug('Fetch %s', self._url)
+-        self._file.read_async(self.__read_async_cb)
+-
+-    def __read_async_cb(self, gfile, result):
+-        try:
+-            stream = gfile.read_finish(result)
+-        except gio.Error, e:
+-            self.stop()
+-            logging.exception('Error while fetching content from %s' %
+-                    self._url)
+-            return
+-        stream.read_async(4096, self.__stream_read_cb)
+-
+-    def __stream_read_cb(self, stream, result):
+-        data = stream.read_finish(result)
+-        if not data:
+-            self._data_finished()
+-            return
+-        self._data_read(data)
+-        stream.read_async(4096, self.__stream_read_cb)
+-
+-    def _data_read(self, data):
+-        self._data += data
+-
+-    def read_finish(self):
+-        pass
+-
+-    def _data_finished(self):
+-        self.emit('progress', ACTION_CHECKING, 'Fetching update '
+-                'information', 2, 3)
+-        parser = MicroformatParser(self._data, self._completion_cb)
+-        gobject.idle_add(parser.parse)
+diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
+deleted file mode 100755
+index 1a3941c..0000000
+--- a/extensions/cpsection/updater/model.py
++++ /dev/null
+@@ -1,383 +0,0 @@
+-# Copyright (C) 2009, Sugar Labs
+-# Copyright (C) 2009, Tomeu Vizoso
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+-"""Sugar bundle updater: model.
+-
+-This module implements the non-GUI portions of the bundle updater, including
+-list of installed bundls, whether updates are needed, and the URL at which to
+-find the bundle updated.
+-"""
+-
+-import os
+-import logging
+-import tempfile
+-from urlparse import urlparse
+-import traceback
+-
+-import gobject
+-import gio
+-
+-from sugar import env
+-from sugar.datastore import datastore
+-from sugar.bundle.activitybundle import ActivityBundle
+-from sugar.bundle.bundleversion import NormalizedVersion
+-
+-from jarabe.model import bundleregistry
+-
+-from backends import microformat
+-
+-class MetaBundle():
+-
+-    def __init__(self, bundle_id, version, name):
+-        self._bundle_id = bundle_id
+-        self._version = version
+-        self._name = name
+-
+-    def get_name(self):
+-        return self._name
+-
+-    def get_bundle_id(self):
+-        return self._bundle_id
+-
+-    def get_icon(self):
+-        pass
+-
+-    def get_activity_version(self):
+-        return self._version
+-
+-class UpdateModel(gobject.GObject):
+-    __gtype_name__ = 'SugarUpdateModel'
+-
+-    __gsignals__ = {
+-        'progress': (gobject.SIGNAL_RUN_FIRST,
+-                     gobject.TYPE_NONE,
+-                     ([int, str, float, int])),
+-    }
+-
+-    ACTION_CHECKING = 0
+-    ACTION_UPDATING = 1
+-    ACTION_DOWNLOADING = 2
+-
+-    def __init__(self):
+-        gobject.GObject.__init__(self)
+-
+-        self.updates = None
+-        self._bundles_to_check = None
+-        self._bundles_to_update = None
+-        self._total_bundles_to_update = 0
+-        self._downloader = None
+-        self._cancelling = False
+-
+-    def __progress_cb(self, model, action, description, current, total):
+-        self.emit('progress', action, description, current, total)
+-
+-    def check_updates(self):
+-        self.updates = []
+-        self._current_bundles = {}
+-        for bundle in bundleregistry.get_registry():
+-            self._current_bundles[bundle.get_bundle_id()] =\
+-                    {'version':bundle.get_activity_version(),
+-                            'bundle': bundle}
+-        self._bundles_to_check = list(bundleregistry.get_registry())
+-        self._fetcher = microformat._UpdateFetcher(self.__bundle_info_fetched_cb)
+-        self._fetcher.connect('progress', self.__progress_cb)
+-        gobject.idle_add(self._fetcher.download_bundle_updates)
+-
+-    def __bundle_info_fetched_cb(self, new_bundles, error_message):
+-        if error_message is not None:
+-            logging.error('Error getting update information from server:\n'
+-                          '%s' % error_message)
+-
+-        if self._cancelling:
+-            self._cancel_checking()
+-        else:
+-            for bundle_id, info in new_bundles.items():
+-                if bundle_id in self._current_bundles:
+-                    old_version = self._current_bundles[bundle_id]['version']
+-                    new_version = new_bundles[bundle_id]['version']
+-                    if NormalizedVersion(old_version) < \
+-                       NormalizedVersion(new_version):
+-                        self.updates.append(BundleUpdate(
+-                            self._current_bundles[bundle_id]['bundle'],
+-                            new_bundles[bundle_id]['version'],
+-                            new_bundles[bundle_id]['url'],
+-                            new_bundles[bundle_id]['size'],
+-                            'update'))
+-                else:
+-                    bundle = MetaBundle(bundle_id,
+-                            new_bundles[bundle_id]['version'],
+-                            new_bundles[bundle_id]['name'])
+-                    self.updates.append(BundleUpdate(bundle,
+-                        new_bundles[bundle_id]['version'],
+-                        new_bundles[bundle_id]['url'],
+-                        new_bundles[bundle_id]['size'],
+-                        'new'))
+-
+-        self.emit('progress', UpdateModel.ACTION_CHECKING, 'Fetching update '
+-                'information', 3, 3)
+-
+-    def update(self, bundle_ids):
+-        self._bundles_to_update = []
+-        for bundle_update in self.updates:
+-            if bundle_update.bundle.get_bundle_id() in bundle_ids:
+-                self._bundles_to_update.append(bundle_update)
+-
+-        self._total_bundles_to_update = len(self._bundles_to_update)
+-        self._download_next_update()
+-
+-    def _download_next_update(self):
+-        if self._cancelling:
+-            self._cancel_updating()
+-            return
+-
+-        bundle_update = self._bundles_to_update.pop()
+-
+-        total = self._total_bundles_to_update * 2
+-        current = total - len(self._bundles_to_update) * 2 - 2
+-
+-        self.emit('progress', UpdateModel.ACTION_DOWNLOADING,
+-                  bundle_update.bundle.get_name(), current, total)
+-
+-        self._downloader = _Downloader(bundle_update)
+-        self._downloader.connect('progress', self.__downloader_progress_cb)
+-        self._downloader.connect('error', self.__downloader_error_cb)
+-
+-    def __downloader_progress_cb(self, downloader, progress):
+-        logging.debug('__downloader_progress_cb %r', progress)
+-
+-        if self._cancelling:
+-            self._cancel_updating()
+-            return
+-
+-        total = self._total_bundles_to_update * 2
+-        current = total - len(self._bundles_to_update) * 2 - 2 + progress
+-
+-        self.emit('progress', UpdateModel.ACTION_DOWNLOADING,
+-                  self._downloader.bundle_update.bundle.get_name(),
+-                  current, total)
+-
+-        if progress == 1:
+-            self._install_update(self._downloader.bundle_update,
+-                                 self._downloader.get_local_file_path())
+-            self._downloader = None
+-
+-    def __downloader_error_cb(self, downloader, error_message):
+-        logging.error('Error downloading update:\n%s', error_message)
+-
+-        if self._cancelling:
+-            self._cancel_updating()
+-            return
+-
+-        total = self._total_bundles_to_update
+-        current = total - len(self._bundles_to_update)
+-        self.emit('progress', UpdateModel.ACTION_UPDATING, '', current, total)
+-
+-        if self._bundles_to_update:
+-            # do it in idle so the UI has a chance to refresh
+-            gobject.idle_add(self._download_next_update)
+-
+-    def _install_update(self, bundle_update, local_file_path):
+-
+-        total = self._total_bundles_to_update
+-        current = total - len(self._bundles_to_update) - 0.5
+-
+-        self.emit('progress', UpdateModel.ACTION_UPDATING,
+-                  bundle_update.bundle.get_name(),
+-                  current, total)
+-
+-        # TODO: Should we first expand the zip async so we can provide progress
+-        # and only then copy to the journal?
+-        jobject = datastore.create()
+-        try:
+-            title = '%s-%s' % (bundle_update.bundle.get_name(),
+-                               bundle_update.version)
+-            jobject.metadata['title'] = title
+-            jobject.metadata['mime_type'] = ActivityBundle.MIME_TYPE
+-            jobject.file_path = local_file_path
+-            datastore.write(jobject, transfer_ownership=True)
+-        finally:
+-            jobject.destroy()
+-
+-        self.emit('progress', UpdateModel.ACTION_UPDATING,
+-                  bundle_update.bundle.get_name(),
+-                  current + 0.5, total)
+-
+-        if self._bundles_to_update:
+-            # do it in idle so the UI has a chance to refresh
+-            gobject.idle_add(self._download_next_update)
+-
+-    def cancel(self):
+-        self._cancelling = True
+-
+-    def _cancel_checking(self):
+-        logging.debug('UpdateModel._cancel_checking')
+-        total = len(bundleregistry.get_registry())
+-        current = total - len(self._bundles_to_check)
+-        self.emit('progress', UpdateModel.ACTION_CHECKING, '', current,
+-                  current)
+-        self._bundles_to_check = None
+-        self._cancelling = False
+-
+-    def _cancel_updating(self):
+-        logging.debug('UpdateModel._cancel_updating')
+-        current = (self._total_bundles_to_update -
+-                   len(self._bundles_to_update) - 1)
+-        self.emit('progress', UpdateModel.ACTION_UPDATING, '', current,
+-                  current)
+-
+-        if self._downloader is not None:
+-            self._downloader.cancel()
+-            file_path = self._downloader.get_local_file_path()
+-            if file_path is not None and os.path.exists(file_path):
+-                os.unlink(file_path)
+-            self._downloader = None
+-
+-        self._total_bundles_to_update = 0
+-        self._bundles_to_update = None
+-        self._cancelling = False
+-
+-
+-class BundleUpdate(object):
+-
+-    def __init__(self, bundle, version, link, size, package_type = None):
+-        self.bundle = bundle
+-        self.version = version
+-        self.link = link
+-        self.size = size
+-
+-        # Specify whether installing a new bundle or updating an
+-        # existing one
+-        self.package_type = package_type
+-
+-class _Downloader(gobject.GObject):
+-    _CHUNK_SIZE = 10240  # 10K
+-    __gsignals__ = {
+-        'progress': (gobject.SIGNAL_RUN_FIRST,
+-                     gobject.TYPE_NONE,
+-                     ([float])),
+-        'error': (gobject.SIGNAL_RUN_FIRST,
+-                  gobject.TYPE_NONE,
+-                  ([str])),
+-    }
+-
+-    def __init__(self, bundle_update):
+-        gobject.GObject.__init__(self)
+-
+-        self.bundle_update = bundle_update
+-        self._input_stream = None
+-        self._output_stream = None
+-        self._pending_buffers = []
+-        self._input_file = gio.File(bundle_update.link)
+-        self._output_file = None
+-        self._downloaded_size = 0
+-        self._cancelling = False
+-
+-        self._input_file.read_async(self.__file_read_async_cb)
+-
+-    def cancel(self):
+-        self._cancelling = True
+-
+-    def __file_read_async_cb(self, gfile, result):
+-        if self._cancelling:
+-            return
+-
+-        try:
+-            self._input_stream = self._input_file.read_finish(result)
+-        except:
+-            self.emit('error', traceback.format_exc())
+-            return
+-
+-        temp_file_path = self._get_temp_file_path(self.bundle_update.link)
+-        self._output_file = gio.File(temp_file_path)
+-        self._output_stream = self._output_file.create()
+-
+-        self._input_stream.read_async(self._CHUNK_SIZE, self.__read_async_cb,
+-                                      gobject.PRIORITY_LOW)
+-
+-    def __read_async_cb(self, input_stream, result):
+-        if self._cancelling:
+-            return
+-
+-        data = input_stream.read_finish(result)
+-
+-        if data is None:
+-            # TODO
+-            pass
+-        elif not data:
+-            logging.debug('closing input stream')
+-            self._input_stream.close()
+-            self._check_if_finished_writing()
+-        else:
+-            self._pending_buffers.append(data)
+-            self._input_stream.read_async(self._CHUNK_SIZE,
+-                                          self.__read_async_cb,
+-                                          gobject.PRIORITY_LOW)
+-
+-        self._write_next_buffer()
+-
+-    def __write_async_cb(self, output_stream, result, user_data):
+-        if self._cancelling:
+-            return
+-
+-        count = output_stream.write_finish(result)
+-
+-        self._downloaded_size += count
+-        progress = self._downloaded_size / float(self.bundle_update.size)
+-        self.emit('progress', progress)
+-
+-        self._check_if_finished_writing()
+-
+-        if self._pending_buffers:
+-            self._write_next_buffer()
+-
+-    def _write_next_buffer(self):
+-        if self._pending_buffers and not self._output_stream.has_pending():
+-            data = self._pending_buffers.pop(0)
+-            # TODO: we pass the buffer as user_data because of
+-            # http://bugzilla.gnome.org/show_bug.cgi?id=564102
+-            self._output_stream.write_async(data, self.__write_async_cb,
+-                                            gobject.PRIORITY_LOW,
+-                                            user_data=data)
+-
+-    def _get_temp_file_path(self, uri):
+-        # TODO: Should we use the HTTP headers for the file name?
+-        scheme_, netloc_, path, params_, query_, fragment_ = \
+-                urlparse(uri)
+-        path = os.path.basename(path)
+-
+-        if not os.path.exists(env.get_user_activities_path()):
+-            os.makedirs(env.get_user_activities_path())
+-
+-        base_name, extension_ = os.path.splitext(path)
+-        fd, file_path = tempfile.mkstemp(dir=env.get_user_activities_path(),
+-                prefix=base_name, suffix='.xo')
+-        os.close(fd)
+-        os.unlink(file_path)
+-
+-        return file_path
+-
+-    def get_local_file_path(self):
+-        return self._output_file.get_path()
+-
+-    def _check_if_finished_writing(self):
+-        if not self._pending_buffers and \
+-                not self._output_stream.has_pending() and \
+-                self._input_stream.is_closed():
+-
+-            logging.debug('closing output stream')
+-            self._output_stream.close()
+-
+-            self.emit('progress', 1.0)
+diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
+deleted file mode 100644
+index 891f552..0000000
+--- a/extensions/cpsection/updater/view.py
++++ /dev/null
+@@ -1,398 +0,0 @@
+-# Copyright (C) 2008, One Laptop Per Child
+-# Copyright (C) 2009, Tomeu Vizoso
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+-
+-from gettext import gettext as _
+-from gettext import ngettext
+-import locale
+-import logging
+-
+-import gobject
+-import gtk
+-
+-from sugar.graphics import style
+-from sugar.graphics.icon import Icon, CellRendererIcon
+-
+-from jarabe.controlpanel.sectionview import SectionView
+-
+-from model import UpdateModel
+-
+-_DEBUG_VIEW_ALL = True
+-
+-
+-class ActivityUpdater(SectionView):
+-
+-    def __init__(self, model, alerts):
+-        SectionView.__init__(self)
+-
+-        self._model = UpdateModel()
+-        self._model.connect('progress', self.__progress_cb)
+-
+-        self.set_spacing(style.DEFAULT_SPACING)
+-        self.set_border_width(style.DEFAULT_SPACING * 2)
+-
+-        self._top_label = gtk.Label()
+-        self._top_label.set_line_wrap(True)
+-        self._top_label.set_justify(gtk.JUSTIFY_LEFT)
+-        self._top_label.props.xalign = 0
+-        self.pack_start(self._top_label, expand=False)
+-        self._top_label.show()
+-
+-        separator = gtk.HSeparator()
+-        self.pack_start(separator, expand=False)
+-        separator.show()
+-
+-        bottom_label = gtk.Label()
+-        bottom_label.set_line_wrap(True)
+-        bottom_label.set_justify(gtk.JUSTIFY_LEFT)
+-        bottom_label.props.xalign = 0
+-        bottom_label.set_markup(
+-                _('Software updates correct errors, eliminate security ' \
+-                  'vulnerabilities, and provide new features.'))
+-        self.pack_start(bottom_label, expand=False)
+-        bottom_label.show()
+-
+-        self._update_box = None
+-        self._progress_pane = None
+-
+-        self._refresh()
+-
+-    def _switch_to_update_box(self):
+-        if self._update_box in self.get_children():
+-            return
+-
+-        if self._progress_pane in self.get_children():
+-            self.remove(self._progress_pane)
+-            self._progress_pane = None
+-
+-        if self._update_box is None:
+-            self._update_box = UpdateBox(self._model)
+-            self._update_box.refresh_button.connect('clicked',
+-                    self.__refresh_button_clicked_cb)
+-            self._update_box.install_button.connect('clicked',
+-                    self.__install_button_clicked_cb)
+-
+-        self.pack_start(self._update_box, expand=True, fill=True)
+-        self._update_box.show()
+-
+-    def _switch_to_progress_pane(self):
+-        if self._progress_pane in self.get_children():
+-            return
+-
+-        if self._update_box in self.get_children():
+-            self.remove(self._update_box)
+-            self._update_box = None
+-
+-        if self._progress_pane is None:
+-            self._progress_pane = ProgressPane()
+-            self._progress_pane.cancel_button.connect('clicked',
+-                    self.__cancel_button_clicked_cb)
+-
+-        self.pack_start(self._progress_pane, expand=True, fill=False)
+-        self._progress_pane.show()
+-
+-    def _clear_center(self):
+-        if self._progress_pane in self.get_children():
+-            self.remove(self._progress_pane)
+-            self._progress_pane = None
+-
+-        if self._update_box in self.get_children():
+-            self.remove(self._update_box)
+-            self._update_box = None
+-
+-    def __progress_cb(self, model, action, bundle_name, current, total):
+-        if current == total and action == UpdateModel.ACTION_CHECKING:
+-            self._finished_checking()
+-            return
+-        elif current == total:
+-            self._finished_updating(int(current))
+-            return
+-
+-        if action == UpdateModel.ACTION_CHECKING:
+-            message = _('%s...') % bundle_name
+-        elif action == UpdateModel.ACTION_DOWNLOADING:
+-            message = _('Downloading %s...') % bundle_name
+-        elif action == UpdateModel.ACTION_UPDATING:
+-            message = _('Updating %s...') % bundle_name
+-
+-        self._switch_to_progress_pane()
+-        self._progress_pane.set_message(message)
+-        self._progress_pane.set_progress(current / float(total))
+-
+-    def _finished_checking(self):
+-        logging.debug('ActivityUpdater._finished_checking')
+-        available_updates = len(self._model.updates)
+-        if not available_updates:
+-            top_message = _('Your software is up-to-date')
+-        else:
+-            top_message = ngettext('You can install %s update',
+-                                   'You can install %s updates',
+-                                   available_updates)
+-            top_message = top_message % available_updates
+-            top_message = gobject.markup_escape_text(top_message)
+-
+-        self._top_label.set_markup('<big>%s</big>' % top_message)
+-
+-        if not available_updates:
+-            self._clear_center()
+-        else:
+-            self._switch_to_update_box()
+-            self._update_box.refresh()
+-
+-    def __refresh_button_clicked_cb(self, button):
+-        self._refresh()
+-
+-    def _refresh(self):
+-        top_message = _('Checking for updates...')
+-        self._top_label.set_markup('<big>%s</big>' % top_message)
+-        self._model.check_updates()
+-
+-    def __install_button_clicked_cb(self, button):
+-        text = '<big>%s</big>' % _('Installing updates...')
+-        self._top_label.set_markup(text)
+-        self._model.update(self._update_box.get_bundles_to_update())
+-
+-    def __cancel_button_clicked_cb(self, button):
+-        self._model.cancel()
+-
+-    def _finished_updating(self, installed_updates):
+-        logging.debug('ActivityUpdater._finished_updating')
+-        top_message = ngettext('%s update was installed',
+-                               '%s updates were installed', installed_updates)
+-        top_message = top_message % installed_updates
+-        top_message = gobject.markup_escape_text(top_message)
+-        self._top_label.set_markup('<big>%s</big>' % top_message)
+-        self._clear_center()
+-
+-    def undo(self):
+-        self._model.cancel()
+-
+-
+-class ProgressPane(gtk.VBox):
+-    """Container which replaces the `ActivityPane` during refresh or
+-    install."""
+-
+-    def __init__(self):
+-        gtk.VBox.__init__(self)
+-        self.set_spacing(style.DEFAULT_PADDING)
+-        self.set_border_width(style.DEFAULT_SPACING * 2)
+-
+-        self._progress = gtk.ProgressBar()
+-        self.pack_start(self._progress)
+-        self._progress.show()
+-
+-        self._label = gtk.Label()
+-        self._label.set_line_wrap(True)
+-        self._label.set_property('xalign', 0.5)
+-        self._label.modify_fg(gtk.STATE_NORMAL,
+-                              style.COLOR_BUTTON_GREY.get_gdk_color())
+-        self.pack_start(self._label)
+-        self._label.show()
+-
+-        alignment_box = gtk.Alignment(xalign=0.5, yalign=0.5)
+-        self.pack_start(alignment_box)
+-        alignment_box.show()
+-
+-        self.cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL)
+-        alignment_box.add(self.cancel_button)
+-        self.cancel_button.show()
+-
+-    def set_message(self, message):
+-        self._label.set_text(message)
+-
+-    def set_progress(self, fraction):
+-        self._progress.props.fraction = fraction
+-
+-
+-class UpdateBox(gtk.VBox):
+-
+-    def __init__(self, model):
+-        gtk.VBox.__init__(self)
+-
+-        self._model = model
+-
+-        self.set_spacing(style.DEFAULT_PADDING)
+-
+-        scrolled_window = gtk.ScrolledWindow()
+-        scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+-        self.pack_start(scrolled_window)
+-        scrolled_window.show()
+-
+-        self._update_list = UpdateList(model)
+-        self._update_list.props.model.connect('row-changed',
+-                                              self.__row_changed_cb)
+-        scrolled_window.add(self._update_list)
+-        self._update_list.show()
+-
+-        bottom_box = gtk.HBox()
+-        bottom_box.set_spacing(style.DEFAULT_SPACING)
+-        self.pack_start(bottom_box, expand=False)
+-        bottom_box.show()
+-
+-        self._size_label = gtk.Label()
+-        self._size_label.props.xalign = 0
+-        self._size_label.set_justify(gtk.JUSTIFY_LEFT)
+-        bottom_box.pack_start(self._size_label, expand=True)
+-        self._size_label.show()
+-
+-        self.refresh_button = gtk.Button(stock=gtk.STOCK_REFRESH)
+-        bottom_box.pack_start(self.refresh_button, expand=False)
+-        self.refresh_button.show()
+-
+-        self.install_button = gtk.Button(_('Install selected'))
+-        self.install_button.props.image = Icon(icon_name='emblem-downloads',
+-                                                icon_size=gtk.ICON_SIZE_BUTTON)
+-        bottom_box.pack_start(self.install_button, expand=False)
+-        self.install_button.show()
+-
+-        self._update_total_size_label()
+-
+-    def refresh(self):
+-        self._update_list.refresh()
+-
+-    def __row_changed_cb(self, list_model, path, iterator):
+-        self._update_total_size_label()
+-        self._update_install_button()
+-
+-    def _update_total_size_label(self):
+-        total_size = 0
+-        for row in self._update_list.props.model:
+-            if row[UpdateListModel.SELECTED]:
+-                total_size += row[UpdateListModel.SIZE]
+-
+-        markup = _('Download size: %s') % _format_size(total_size)
+-        self._size_label.set_markup(markup)
+-
+-    def _update_install_button(self):
+-        for row in self._update_list.props.model:
+-            if row[UpdateListModel.SELECTED]:
+-                self.install_button.props.sensitive = True
+-                return
+-        self.install_button.props.sensitive = False
+-
+-    def get_bundles_to_update(self):
+-        bundles_to_update = []
+-        for row in self._update_list.props.model:
+-            if row[UpdateListModel.SELECTED]:
+-                bundles_to_update.append(row[UpdateListModel.BUNDLE_ID])
+-        return bundles_to_update
+-
+-
+-class UpdateList(gtk.TreeView):
+-
+-    def __init__(self, model):
+-        list_model = UpdateListModel(model)
+-        gtk.TreeView.__init__(self, list_model)
+-
+-        self.set_reorderable(False)
+-        self.set_enable_search(False)
+-        self.set_headers_visible(False)
+-
+-        toggle_renderer = gtk.CellRendererToggle()
+-        toggle_renderer.props.activatable = True
+-        toggle_renderer.props.xpad = style.DEFAULT_PADDING
+-        toggle_renderer.props.indicator_size = style.zoom(26)
+-        toggle_renderer.connect('toggled', self.__toggled_cb)
+-
+-        toggle_column = gtk.TreeViewColumn()
+-        toggle_column.pack_start(toggle_renderer)
+-        toggle_column.add_attribute(toggle_renderer, 'active',
+-                                    UpdateListModel.SELECTED)
+-        self.append_column(toggle_column)
+-
+-        icon_renderer = CellRendererIcon(self)
+-        icon_renderer.props.width = style.STANDARD_ICON_SIZE
+-        icon_renderer.props.height = style.STANDARD_ICON_SIZE
+-        icon_renderer.props.size = style.STANDARD_ICON_SIZE
+-        icon_renderer.props.xpad = style.DEFAULT_PADDING
+-        icon_renderer.props.ypad = style.DEFAULT_PADDING
+-        icon_renderer.props.stroke_color = style.COLOR_TOOLBAR_GREY.get_svg()
+-        icon_renderer.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
+-
+-        icon_column = gtk.TreeViewColumn()
+-        icon_column.pack_start(icon_renderer)
+-        icon_column.add_attribute(icon_renderer, 'file-name',
+-                                  UpdateListModel.ICON_FILE_NAME)
+-        self.append_column(icon_column)
+-
+-        text_renderer = gtk.CellRendererText()
+-
+-        description_column = gtk.TreeViewColumn()
+-        description_column.pack_start(text_renderer)
+-        description_column.add_attribute(text_renderer, 'markup',
+-                                         UpdateListModel.DESCRIPTION)
+-        self.append_column(description_column)
+-
+-    def __toggled_cb(self, cell_renderer, path):
+-        row = self.props.model[path]
+-        row[UpdateListModel.SELECTED] = not row[UpdateListModel.SELECTED]
+-
+-    def refresh(self):
+-        pass
+-
+-
+-class UpdateListModel(gtk.ListStore):
+-
+-    BUNDLE_ID = 0
+-    SELECTED = 1
+-    ICON_FILE_NAME = 2
+-    DESCRIPTION = 3
+-    SIZE = 4
+-
+-    def __init__(self, model):
+-        gtk.ListStore.__init__(self, str, bool, str, str, int)
+-
+-        for bundle_update in model.updates:
+-            row = [None] * 5
+-            row[self.BUNDLE_ID] = bundle_update.bundle.get_bundle_id()
+-            row[self.SELECTED] = False
+-            row[self.ICON_FILE_NAME] = bundle_update.bundle.get_icon()
+-
+-            if bundle_update.package_type == 'update':
+-                row[self.SELECTED] = True
+-                details = _('From version %(current)s to %(new)s (Size: %(size)s)')
+-                details = details % \
+-                        {'current': bundle_update.bundle.get_activity_version(),
+-                         'new': bundle_update.version,
+-                         'size': _format_size(bundle_update.size)}
+-            elif bundle_update.package_type == 'new':
+-                details = _('Install new activity version %(new)s (Size: %(size)s)')
+-                details = details % \
+-                        {'new': bundle_update.version,
+-                         'size': _format_size(bundle_update.size)}
+-
+-            row[self.DESCRIPTION] = '<b>%s</b>\n%s' % \
+-                    (bundle_update.bundle.get_name(), details)
+-
+-            row[self.SIZE] = bundle_update.size
+-
+-            self.append(row)
+-
+-
+-def _format_size(size):
+-    """Convert a given size in bytes to a nicer better readable unit"""
+-    if size == 0:
+-        # TRANS: download size is 0
+-        return _('None')
+-    elif size < 1024:
+-        # TRANS: download size of very small updates
+-        return _('1 KB')
+-    elif size < 1024 * 1024:
+-        # TRANS: download size of small updates, e.g. '250 KB'
+-        return locale.format_string(_('%.0f KB'), size / 1024.0)
+-    else:
+-        # TRANS: download size of updates, e.g. '2.3 MB'
+-        return locale.format_string(_('%.1f MB'), size / 1024.0 / 1024)
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0073-sl-2713-Add-last-updated-on-field-to-CP-About-my-com.patch b/rpms/sugar/0073-sl-2713-Add-last-updated-on-field-to-CP-About-my-com.patch
new file mode 100644
index 0000000..619dfed
--- /dev/null
+++ b/rpms/sugar/0073-sl-2713-Add-last-updated-on-field-to-CP-About-my-com.patch
@@ -0,0 +1,123 @@
+From a69b1c66bfb8adaa80dd98f8e3023a4516dd284e Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@sugarlabs.org>
+Date: Tue, 8 Nov 2011 22:49:50 +0000
+Subject: [PATCH sugar 73/74] sl#2713: Add last updated on field to CP/About
+ my computer
+
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+---
+ extensions/cpsection/aboutcomputer/model.py |   60 ++++++++++++++++++++++++++-
+ extensions/cpsection/aboutcomputer/view.py  |   22 ++++++++++
+ 2 files changed, 81 insertions(+), 1 deletions(-)
+
+diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
+index 52a1094..753055d 100644
+--- a/extensions/cpsection/aboutcomputer/model.py
++++ b/extensions/cpsection/aboutcomputer/model.py
+@@ -27,7 +27,6 @@
+ 
+ from jarabe import config
+ 
+-
+ _NM_SERVICE = 'org.freedesktop.NetworkManager'
+ _NM_PATH = '/org/freedesktop/NetworkManager'
+ _NM_IFACE = 'org.freedesktop.NetworkManager'
+@@ -254,3 +253,62 @@ def get_license():
+     except IOError:
+         license_text = _not_available
+     return license_text
++
++def get_last_updated_on_field():
++
++    # Get the number of UNIX seconds of the last update date.
++    last_update_unix_seconds = {}
++    try:
++        SERVICE_NAME      = 'org.sugarlabs.client.System'
++        SERVICE_PATH      = '/org/sugarlabs/client/System'
++        SERVICE_INTERFACE = 'org.sugarlabs.client.System'
++
++        bus_class    = dbus.SystemBus()
++        system_obj   = bus_class.get_object(SERVICE_NAME, SERVICE_PATH)
++        system_iface = dbus.Interface(system_obj, SERVICE_INTERFACE)
++        system_props = dbus.Interface(system_iface,
++                                      dbus.PROPERTIES_IFACE)
++        last_update_unix_seconds = system_props.Get(SERVICE_INTERFACE,
++                                                   'LastUpdate')
++    except:
++        msg_str = ('There was some error fetching the last-update-time'
++                   '\nfrom sugar-server. Please contact Support.')
++        _logger.exception(msg_str)
++        return _(msg_str)
++
++    # Check once agin that 'last_update_unix_seconds' is not empty.
++    # You never know !
++    if not last_update_unix_seconds:
++        return _('No update yet!')
++
++    # If we reached here, we have the last-update-time, but it's in
++    # timestamp format.
++    # Using python-subprocess-module (no shell involved), to convert
++    # it into readable date-format; the hack being used (after
++    # removing '-u' option) is the first one mentioned at :
++    # http://www.commandlinefu.com/commands/view/3719/convert-unix-timestamp-to-date
++    environment = os.environ.copy()
++    environment['PATH'] = '%s:/usr/sbin' % (environment['PATH'], )
++
++    last_update_readable_format = {}
++    try:
++        last_update_readable_format = \
++                 subprocess.Popen(['date', '-d',
++                                   '1970-01-01 + ' +
++                                   str(last_update_unix_seconds) +
++                                   ' seconds'],
++                                   stdout=subprocess.PIPE,
++                                   env=environment).stdout.readlines()[0]
++    except:
++        msg_str = ('There was some error in the processing of'
++                  '\nlast-update-time. Please contact Support.')
++        _logger.exception(msg_str)
++        return _(msg_str)
++
++    if not last_update_readable_format:
++        return _('There was some error in the processing of\n'
++                 'last-update-time. Please contact Support.')
++
++    # Everything should be fine (hopefully :-) )
++    return last_update_readable_format
++
+diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
+index d719372..dd2f200 100644
+--- a/extensions/cpsection/aboutcomputer/view.py
++++ b/extensions/cpsection/aboutcomputer/view.py
+@@ -171,6 +171,28 @@ def _setup_software(self):
+         box_software.pack_start(box_wireless_fw, expand=False)
+         box_wireless_fw.show()
+ 
++        # Try to fetch "Last Updated On" field from the model.
++        # If the field is not empty, display it.
++        # At present, the field is returned empty, only if "root-access"
++        #    is disabled on the target-machine.
++        last_updated_on_field = self._model.get_last_updated_on_field()
++        if last_updated_on_field:
++            box_last_updated_on = gtk.HBox(spacing=style.DEFAULT_SPACING)
++            label_last_updated_on  = gtk.Label(_('Last Updated On:'))
++            label_last_updated_on.set_alignment(1, 0)
++            label_last_updated_on.modify_fg(gtk.STATE_NORMAL,
++                                   style.COLOR_SELECTION_GREY.get_gdk_color())
++            box_last_updated_on.pack_start(label_last_updated_on, expand=False)
++            self._group.add_widget(label_last_updated_on)
++            label_last_updated_on.show()
++            label_last_updated_on_field = \
++                                   gtk.Label(last_updated_on_field)
++            label_last_updated_on_field.set_alignment(0, 0)
++            box_last_updated_on.pack_start(label_last_updated_on_field, expand=False)
++            label_last_updated_on_field.show()
++            box_software.pack_start(box_last_updated_on, expand=False)
++            box_last_updated_on.show()
++
+         self._vbox.pack_start(box_software, expand=False)
+         box_software.show()
+ 
+-- 
+1.7.6
+
diff --git a/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch b/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch
new file mode 100644
index 0000000..2ab1112
--- /dev/null
+++ b/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch
@@ -0,0 +1,31 @@
+From a426426480d813fb8832819bdf5740ab8b036e5b Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajay@sugarlabs.org>
+Date: Tue, 8 Nov 2011 22:51:13 +0000
+Subject: [PATCH sugar 74/74] AU#694: More friendly message when not able to
+ connect to XS
+
+Signed-off-by: Ajay Garg <ajay@sugarlabs.org>
+Authored-by: Ajay Garg <ajay@sugarlabs.org>
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+---
+ src/jarabe/desktop/schoolserver.py |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
+index 403897b..b9b8830 100644
+--- a/src/jarabe/desktop/schoolserver.py
++++ b/src/jarabe/desktop/schoolserver.py
+@@ -140,7 +140,9 @@ def register_laptop(url=_REGISTER_URL):
+         data = server.register(sn, nick, uuid_, profile.pubkey)
+     except (xmlrpclib.Error, TypeError, socket.error):
+         logging.exception('Registration: cannot connect to server')
+-        raise RegisterError(_('Cannot connect to the server.'))
++        raise RegisterError(_('Please ensure that you are connected '   \
++                              'to the correct network and that the '    \
++                              'server is available.'))
+     finally:
+         socket.setdefaulttimeout(None)
+ 
+-- 
+1.7.6
+