Synced with upstream tag v4.1.0, moved AUlangs.diff to 0000-AUlangs.patch and removed 0000-Add-files-from-git

10 files changed, 12 insertions, 2908 deletions

diff --git a/examples/olpc-os-11.3.1-xo1.5.ini b/examples/olpc-os-11.3.1-xo1.5.ini
index 18f1061..9b3293b 100644
--- a/examples/olpc-os-11.3.1-xo1.5.ini
+++ b/examples/olpc-os-11.3.1-xo1.5.ini
@@ -1,5 +1,5 @@
 [global]
-suggested_oob_version=4.0
+suggested_oob_version=4.1
 fedora_release=14
 olpc_version_major=11
 olpc_version_minor=3
diff --git a/examples/olpc-os-11.3.1-xo1.75.ini b/examples/olpc-os-11.3.1-xo1.75.ini
index 2f67e59..53b7f99 100644
--- a/examples/olpc-os-11.3.1-xo1.75.ini
+++ b/examples/olpc-os-11.3.1-xo1.75.ini
@@ -1,5 +1,5 @@
 [global]
-suggested_oob_version=4.0
+suggested_oob_version=4.1
 fedora_release=14
 olpc_version_major=11
 olpc_version_minor=3
diff --git a/examples/olpc-os-11.3.1-xo1.ini b/examples/olpc-os-11.3.1-xo1.ini
index 02137e5..93819ef 100644
--- a/examples/olpc-os-11.3.1-xo1.ini
+++ b/examples/olpc-os-11.3.1-xo1.ini
@@ -1,5 +1,5 @@
 [global]
-suggested_oob_version=4.0
+suggested_oob_version=4.1
 fedora_release=14
 olpc_version_major=11
 olpc_version_minor=3
diff --git a/modules/library_homepage/kspost.50.nochroot.library.sh b/modules/library_homepage/kspost.50.nochroot.library.sh
index ca0a27d..5ca1f38 100644
--- a/modules/library_homepage/kspost.50.nochroot.library.sh
+++ b/modules/library_homepage/kspost.50.nochroot.library.sh
@@ -17,3 +17,4 @@ fi
 
 # synchronize the files within the path, conserving directory structure
 echo "rsync -rlpt \"$path\"/ \"\$INSTALL_ROOT/usr/share/library-common/\""
+echo "chmod -R ugo+rx \"\$INSTALL_ROOT/usr/share/library-common/\""
diff --git a/modules/sd_card_image/image.50.makefs.sh b/modules/sd_card_image/image.50.makefs.sh
index 4fdc677..a88f72a 100644
--- a/modules/sd_card_image/image.50.makefs.sh
+++ b/modules/sd_card_image/image.50.makefs.sh
@@ -50,7 +50,10 @@ make_image()
 8192,131072,83,*
 139264,,,
 EOF
-	local img_sectors=$(sfdisk -uS -l $img | grep img2 | awk '{print $4}')
+	# sfdisk output truncates paths that are too long
+	pushd $intermediatesdir
+	local img_sectors=$(sfdisk -uS -l $(basename $img) | grep img2 | awk '{print $4}')
+	popd
 	echo "(1 losetup error is normal here)"
 	losetup -d /dev/loop6 || :
 	losetup -o $((8192 * $BLOCK_SIZE)) --sizelimit $((131072 * $BLOCK_SIZE)) /dev/loop6 $img
diff --git a/modules/x11/kspost.60.misc.inc b/modules/x11/kspost.60.misc.inc
index 1b284e3..d812e59 100644
--- a/modules/x11/kspost.60.misc.inc
+++ b/modules/x11/kspost.60.misc.inc
@@ -1,6 +1,3 @@
-# Workaround an unknown bug where TamTam sound is crackly on XO-1.5 (#9414)
-sed -i -e 's/dmix.rate 48000/dmix.rate 44100/' /usr/share/alsa/alsa.conf
-
 # Don't try and autospawn pulseaudio (#9470)
 sed -i -e 's/; autospawn = yes/autospawn = no/' /etc/pulse/client.conf
 
diff --git a/modules/xo1_75/kspkglist.50.xo1_75.inc b/modules/xo1_75/kspkglist.50.xo1_75.inc
index 99c85ae..5229ebc 100644
--- a/modules/xo1_75/kspkglist.50.xo1_75.inc
+++ b/modules/xo1_75/kspkglist.50.xo1_75.inc
@@ -5,3 +5,6 @@ olpc-runin-tests
 
 # currently not pulled in by ARM for some reason
 ntfs-3g
+
+# 2-bpp version of Adwaita cursors
+cursors-adwaita2b
diff --git a/osbuilder.py b/osbuilder.py
index 2893166..6dc5165 100755
--- a/osbuilder.py
+++ b/osbuilder.py
@@ -18,7 +18,7 @@
 #
 
 # canonical source of version number
-VERSION="4.0.0"
+VERSION="4.1.0"
 
 # "make install" modifies this in the installed copy
 INSTALLED=0
diff --git a/rpms/sugar/AUlangs.diff b/rpms/sugar/0000-AUlangs.patch
index 09a6a75..09a6a75 100644
--- a/rpms/sugar/AUlangs.diff
+++ b/rpms/sugar/0000-AUlangs.patch
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
deleted file mode 100644
index 91f84a8..0000000
--- a/rpms/sugar/0000-Add-files-from-git-that-are-missing-from-tarball.patch
+++ /dev/null
@@ -1,2900 +0,0 @@
-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
-