Imported Upstream version 0.82.9upstream/0.82.9upstream-0.82

12 files changed, 846 insertions, 396 deletions

diff --git a/configure b/configure
index 66c0140..799ef3c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sugar 0.82.8.
+# Generated by GNU Autoconf 2.61 for Sugar 0.82.9.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sugar'
 PACKAGE_TARNAME='sugar'
-PACKAGE_VERSION='0.82.8'
-PACKAGE_STRING='Sugar 0.82.8'
+PACKAGE_VERSION='0.82.9'
+PACKAGE_STRING='Sugar 0.82.9'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="configure.ac"
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sugar 0.82.8 to adapt to many kinds of systems.
+\`configure' configures Sugar 0.82.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1331,7 +1331,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sugar 0.82.8:";;
+     short | recursive ) echo "Configuration of Sugar 0.82.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,7 +1420,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sugar configure 0.82.8
+Sugar configure 0.82.9
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1434,7 +1434,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sugar $as_me 0.82.8, which was
+It was created by Sugar $as_me 0.82.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2133,7 +2133,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar'
- VERSION='0.82.8'
+ VERSION='0.82.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6794,7 +6794,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sugar $as_me 0.82.8, which was
+This file was extended by Sugar $as_me 0.82.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6841,7 +6841,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sugar config.status 0.82.8
+Sugar config.status 0.82.9
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 028b807..6b90065 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.82.8],[],[sugar])
+AC_INIT([Sugar],[0.82.9],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/data/activities.defaults b/data/activities.defaults
index fe229a1..b726355 100644
--- a/data/activities.defaults
+++ b/data/activities.defaults
@@ -1,19 +1,30 @@
 # Activities to be automatically added to the ring after an upgrade
 
-org.laptop.Chat
-org.laptop.WebActivity
+com.garycmartin.Moon
+com.jotaro.ImplodeActivity
+com.laptop.Ruler
+edu.mit.media.ScratchActivity
 org.laptop.AbiWordActivity
-org.laptop.RecordActivity
-org.laptop.Oficina
-org.laptop.TamTamMini
-org.vpri.EtoysActivity
-org.laptop.TurtleArtActivity
-org.laptop.Pippy
+org.laptop.AcousticMeasure
+org.laptop.Analyze
 org.laptop.Calculate
-org.laptop.Terminal
+org.laptop.Chat
+org.laptop.HelpActivity
+org.laptop.Log
 org.laptop.MeasureActivity
-org.laptop.AcousticMeasure
 org.laptop.Memorize
-org.laptop.TamTamJam
+org.laptop.Oficina
+org.laptop.Pippy
+org.laptop.RecordActivity
 org.laptop.TamTamEdit
+org.laptop.TamTamJam
+org.laptop.TamTamMini
 org.laptop.TamTamSynthLab
+org.laptop.Terminal
+org.laptop.TurtleArtActivity
+org.laptop.WebActivity
+org.laptop.WikipediaActivityEN
+org.laptop.sugar.ReadActivity
+org.vpri.EtoysActivity
+vu.lux.olpc.Maze
+vu.lux.olpc.Speak
diff --git a/po/es.po b/po/es.po
index 28c7d24..a4d98ae 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-01 18:31-0400\n"
-"PO-Revision-Date: 2008-08-28 19:35-0400\n"
+"POT-Creation-Date: 2008-09-19 00:30-0400\n"
+"PO-Revision-Date: 2008-09-20 14:48-0400\n"
 "Last-Translator: Rafael Ortiz <rafael@laptop.org>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -38,15 +38,15 @@ msgstr "Hecho"
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/view/BuddyMenu.py:58
+#: ../src/view/BuddyMenu.py:60
 msgid "Remove friend"
 msgstr "Eliminar amigo"
 
-#: ../src/view/BuddyMenu.py:61
+#: ../src/view/BuddyMenu.py:63
 msgid "Make friend"
 msgstr "Agregar amigo"
 
-#: ../src/view/BuddyMenu.py:90
+#: ../src/view/BuddyMenu.py:92
 #, python-format
 msgid "Invite to %s"
 msgstr "Invitar a %s"
@@ -67,7 +67,7 @@ msgstr "Abrir"
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:87
+#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:85
 msgid "Keep"
 msgstr "Guardar"
 
@@ -104,71 +104,61 @@ msgstr "No se puede conectar al servidor"
 msgid "The server could not complete the request."
 msgstr "El servidor no pudo completar la petición "
 
-#: ../src/view/Shell.py:262
+#: ../src/view/Shell.py:251
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../src/view/home/HomeBox.py:81
+#: ../src/view/home/HomeBox.py:79
 msgid "Confirm erase"
 msgstr "Confirmar borrado"
 
-#: ../src/view/home/HomeBox.py:83
+#: ../src/view/home/HomeBox.py:81
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Confirmar borrado: Quiere borrar permanentemente %s?"
 
-#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:88 ../src/view/palettes.py:120
 msgid "Erase"
 msgstr "Borrar"
 
-#: ../src/view/home/HomeBox.py:120
+#: ../src/view/home/HomeBox.py:118
 msgid "Software Update"
 msgstr "Actualización de Software"
 
-#: ../src/view/home/HomeBox.py:121
+#: ../src/view/home/HomeBox.py:119
 msgid "Update your activities to ensure compatibility with your new software"
-msgstr "Actualice sus actividades para asegurar compatibilidad con su nuevo software."
+msgstr ""
+"Actualice sus actividades para asegurar compatibilidad con su nuevo "
+"software."
 
-#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
+#: ../src/view/home/HomeBox.py:123 ../src/controlpanel/toolbar.py:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:276
+#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/gui.py:286
 msgid "Later"
 msgstr "Después"
 
-#: ../src/view/home/HomeBox.py:130
+#: ../src/view/home/HomeBox.py:128
 msgid "Check now"
 msgstr "Probar ahora"
 
-#: ../src/view/home/HomeBox.py:266
+#: ../src/view/home/HomeBox.py:262
 msgid "List view"
 msgstr "Vista en lista"
 
-#: ../src/view/home/HomeBox.py:267
+#: ../src/view/home/HomeBox.py:263
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:321
 msgid "Favorites view"
 msgstr "Vista de Favoritos"
 
-#: ../src/view/home/HomeBox.py:326
+#: ../src/view/home/HomeBox.py:322
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-# TRANS: label for the freeform layout in the favorites view
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:334
-msgid "Freeform"
-msgstr "Forma libre"
-
-# TRANS: label for the ring layout in the favorites view
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:341
-msgid "Ring"
-msgstr "Anillo"
-
 #: ../src/view/home/MeshBox.py:97
 msgid "Connect"
 msgstr "Conectar"
@@ -257,7 +247,7 @@ msgstr "Silenciar"
 #: ../src/view/devices/network/wireless.py:37
 #, python-format
 msgid "IP address: %s"
-msgstr ""
+msgstr "Direccion IP: %s"
 
 #: ../src/view/devices/network/wireless.py:86
 msgid "Disconnected"
@@ -330,23 +320,23 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Para aplicar sus cambios tiene que reiniciar sugar.\n"
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:268
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:278
 msgid "Changes require restart"
 msgstr "Los cambios requieren reiniciar"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/controlpanel/gui.py:277
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/controlpanel/gui.py:281
 msgid "Cancel changes"
 msgstr "Cancelar cambios"
 
-#: ../src/controlpanel/gui.py:280
+#: ../src/controlpanel/gui.py:290
 msgid "Restart now"
 msgstr "Reiniciar ahora"
 
@@ -386,7 +376,7 @@ msgstr "Error en colores especificados."
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../src/controlpanel/model/datetime.py:85
+#: ../src/controlpanel/model/datetime.py:89
 msgid "Error timezone does not exist."
 msgstr "Error, zona horaria no existe."
 
@@ -399,25 +389,21 @@ msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
 
-#: ../src/controlpanel/model/language.py:110
+#: ../src/controlpanel/model/language.py:114
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "El lenguaje del código=%s no pudo ser determinado."
 
-#: ../src/controlpanel/model/language.py:127
+#: ../src/controlpanel/model/language.py:131
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Lo siento yo no hablo '%s'."
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "Debe ingresar un servidor"
-
-#: ../src/controlpanel/model/network.py:63
+#: ../src/controlpanel/model/network.py:62
 msgid "State is unknown."
 msgstr "Estado desconocido."
 
-#: ../src/controlpanel/model/network.py:83
+#: ../src/controlpanel/model/network.py:82
 msgid "Error in specified radio argument use on/off."
 msgstr "Error en argumento especificado de radio use on/off."
 
@@ -458,9 +444,10 @@ msgstr "Software"
 msgid "Build:"
 msgstr "Ensamble:"
 
+# should this be translated?--let's call it azucar then ;)
 #: ../src/controlpanel/view/aboutxo.py:115
 msgid "Sugar:"
-msgstr ""
+msgstr "Azucar:"
 
 #: ../src/controlpanel/view/aboutxo.py:130
 msgid "Firmware:"
@@ -468,24 +455,31 @@ msgstr "Firmware"
 
 #: ../src/controlpanel/view/aboutxo.py:152
 msgid "Copyright and License"
-msgstr ""
+msgstr "Licencia y Copyright"
 
+# should this be translated?--only the last phrase.
 #: ../src/controlpanel/view/aboutxo.py:160
 msgid ""
 "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 msgstr ""
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; y  Contribuyentes."
 
-#: ../src/controlpanel/view/aboutxo.py:166
+#: ../src/controlpanel/view/aboutxo.py:167
+#, fuzzy
 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 es la  interfaz grafica de usuario que esta mirando. Sugar es software "
+"libre, cubierto por la Licencia Publica General GNU, y esta bienvenido para "
+"cambiarla y/o distribuir copias de esta dentro de ciertas condiciones "
+"descritas en el."
 
-#: ../src/controlpanel/view/aboutxo.py:178
+#: ../src/controlpanel/view/aboutxo.py:179
 msgid "Full license:"
-msgstr ""
+msgstr "Licencia Completa:"
 
 #: ../src/controlpanel/view/datetime.py:29
 msgid "Date & Time"
@@ -533,19 +527,31 @@ msgstr "Idioma"
 msgid "Network"
 msgstr "Red"
 
-#: ../src/controlpanel/view/network.py:53
+#: ../src/controlpanel/view/network.py:54
 msgid "Wireless"
 msgstr "Inalámbrica"
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/controlpanel/view/network.py:62
+msgid "Turn of the wireless radio to save battery life"
+msgstr "Apague el radio de la inalámbrica para ahorrar vida de la batería"
+
+#: ../src/controlpanel/view/network.py:75
+msgid "Radio"
 msgstr "Radio:"
 
-#: ../src/controlpanel/view/network.py:94
+#: ../src/controlpanel/view/network.py:91
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "Descartar el historial de la red, si tiene problemas de conexión "
+
+#: ../src/controlpanel/view/network.py:100
+msgid "Discard network history"
+msgstr "Descartar historial de la red"
+
+#: ../src/controlpanel/view/network.py:113
 msgid "Mesh"
 msgstr "Malla"
 
-#: ../src/controlpanel/view/network.py:103
+#: ../src/controlpanel/view/network.py:122
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -601,36 +607,36 @@ msgstr "Red Malla Desconocida"
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/view/home/favoritesview.py:287
+#: ../src/view/home/favoritesview.py:296
 msgid "Registration Failed"
 msgstr "Registro Fallido"
 
-#: ../src/view/home/favoritesview.py:288
+#: ../src/view/home/favoritesview.py:297
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:290
+#: ../src/view/home/favoritesview.py:299
 msgid "Registration Successful"
 msgstr "Registro Exitoso"
 
-#: ../src/view/home/favoritesview.py:291
+#: ../src/view/home/favoritesview.py:300
 msgid "You are now registered with your school server."
 msgstr "Ahora estas registrado en el servidor de colegio"
 
-#: ../src/view/home/favoritesview.py:407
+#: ../src/view/home/favoritesview.py:420
 msgid "Control Panel"
 msgstr "Panel de Control"
 
-#: ../src/view/home/favoritesview.py:418
+#: ../src/view/home/favoritesview.py:425
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../src/view/home/favoritesview.py:423
+#: ../src/view/home/favoritesview.py:430
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../src/view/home/favoritesview.py:429
+#: ../src/view/home/favoritesview.py:436
 msgid "Register"
 msgstr "Registro"
 
@@ -646,23 +652,34 @@ msgstr "Parar"
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../src/view/palettes.py:132
+#: ../src/view/palettes.py:138
 msgid "Remove favorite"
 msgstr "Remover favorito"
 
-#: ../src/view/palettes.py:136
+#: ../src/view/palettes.py:142
 msgid "Make favorite"
 msgstr "Hacer favorito"
 
-#: ../src/view/palettes.py:185
+#: ../src/view/palettes.py:191
 msgid "Show contents"
 msgstr "Mostrar contenidos"
 
-#: ../src/view/palettes.py:209
+#: ../src/view/palettes.py:215
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB libres"
 
+# TRANS: label for the freeform layout in the favorites view
+#~ msgid "Freeform"
+#~ msgstr "Forma libre"
+
+# TRANS: label for the ring layout in the favorites view
+#~ msgid "Ring"
+#~ msgstr "Anillo"
+
+#~ msgid "You must enter a server."
+#~ msgstr "Debe ingresar un servidor"
+
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
 
diff --git a/po/fr.po b/po/fr.po
index dad93ca..f178deb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-01 18:31-0400\n"
-"PO-Revision-Date: 2008-09-10 00:12-0400\n"
+"POT-Creation-Date: 2008-09-19 00:30-0400\n"
+"PO-Revision-Date: 2008-09-21 09:13-0400\n"
 "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,15 +35,15 @@ msgstr "Accepter"
 msgid "Next"
 msgstr "Suivant"
 
-#: ../src/view/BuddyMenu.py:58
+#: ../src/view/BuddyMenu.py:60
 msgid "Remove friend"
 msgstr "Retirer de mes amis"
 
-#: ../src/view/BuddyMenu.py:61
+#: ../src/view/BuddyMenu.py:63
 msgid "Make friend"
 msgstr "Ajouter à mes amis"
 
-#: ../src/view/BuddyMenu.py:90
+#: ../src/view/BuddyMenu.py:92
 #, python-format
 msgid "Invite to %s"
 msgstr "Inviter à %s"
@@ -64,7 +64,7 @@ msgstr "Ouvrir"
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:87
+#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:85
 msgid "Keep"
 msgstr "Conserver"
 
@@ -101,72 +101,60 @@ msgstr "Impossible de se connecter au serveu."
 msgid "The server could not complete the request."
 msgstr "Le serveur n'a pas pu achever la requête."
 
-#: ../src/view/Shell.py:262
+#: ../src/view/Shell.py:251
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: ../src/view/home/HomeBox.py:81
+#: ../src/view/home/HomeBox.py:79
 msgid "Confirm erase"
 msgstr "Confirmer la suppression"
 
 # Conformer la suppression : faut-il supprimer %s définitivement ?
-#: ../src/view/home/HomeBox.py:83
+#: ../src/view/home/HomeBox.py:81
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Confirmer la suppression : faut-il supprimer %s définitivement ?"
 
-#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:88 ../src/view/palettes.py:120
 msgid "Erase"
 msgstr "Supprimer"
 
-#: ../src/view/home/HomeBox.py:120
+#: ../src/view/home/HomeBox.py:118
 msgid "Software Update"
 msgstr "Mise à jour logicielle"
 
-#: ../src/view/home/HomeBox.py:121
+#: ../src/view/home/HomeBox.py:119
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr "Actualiser les activités pour assurer la compatibilité logicielle"
 
-#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
+#: ../src/view/home/HomeBox.py:123 ../src/controlpanel/toolbar.py:115
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:276
+#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/gui.py:286
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../src/view/home/HomeBox.py:130
+#: ../src/view/home/HomeBox.py:128
 msgid "Check now"
 msgstr "Vérifier maintenant"
 
-#: ../src/view/home/HomeBox.py:266
+#: ../src/view/home/HomeBox.py:262
 msgid "List view"
 msgstr "Écran liste"
 
-#: ../src/view/home/HomeBox.py:267
+#: ../src/view/home/HomeBox.py:263
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:321
 msgid "Favorites view"
 msgstr "Écran favoris"
 
-#: ../src/view/home/HomeBox.py:326
+#: ../src/view/home/HomeBox.py:322
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-# TRANS: label for the freeform layout in the favorites view
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:334
-msgid "Freeform"
-msgstr "Libre"
-
-# TRANS: label for the ring layout in the favorites view
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:341
-msgid "Ring"
-msgstr "Concentrique"
-
 #: ../src/view/home/MeshBox.py:97
 msgid "Connect"
 msgstr "Connecter"
@@ -325,23 +313,23 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Redémarrer sugar pour que les changements prennent effet.\n"
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:268
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:278
 msgid "Changes require restart"
 msgstr "Relancer pour valider"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/controlpanel/gui.py:277
 msgid "Warning"
 msgstr "Attention"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/controlpanel/gui.py:281
 msgid "Cancel changes"
 msgstr "Abandonner"
 
-#: ../src/controlpanel/gui.py:280
+#: ../src/controlpanel/gui.py:290
 msgid "Restart now"
 msgstr "Maintenant"
 
@@ -381,7 +369,7 @@ msgstr "Erreur dans les couleurs spécifiées."
 msgid "Not available"
 msgstr "Non disponible"
 
-#: ../src/controlpanel/model/datetime.py:85
+#: ../src/controlpanel/model/datetime.py:89
 msgid "Error timezone does not exist."
 msgstr "Erreur : la zone temporelle n'existe pas."
 
@@ -393,25 +381,21 @@ msgstr "La valeur doit être un entier."
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Accès impossible à ~/.i18n. Création de paramètres par défaut."
 
-#: ../src/controlpanel/model/language.py:110
+#: ../src/controlpanel/model/language.py:114
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "La langue associée au code = %s n'a pas pu être déterminée."
 
-#: ../src/controlpanel/model/language.py:127
+#: ../src/controlpanel/model/language.py:131
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Désolé je ne parle pas '%s'."
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "Vous devez indiquer un serveur."
-
-#: ../src/controlpanel/model/network.py:63
+#: ../src/controlpanel/model/network.py:62
 msgid "State is unknown."
 msgstr "État inconnu."
 
-#: ../src/controlpanel/model/network.py:83
+#: ../src/controlpanel/model/network.py:82
 msgid "Error in specified radio argument use on/off."
 msgstr "Argument 'radio' spécifié incorrect. Utiliser marche/arrêt."
 
@@ -470,7 +454,7 @@ msgstr ""
 "© 2008 One Laptop per Child Association Inc ; Red Hat Inc ; et "
 "contributeurs."
 
-#: ../src/controlpanel/view/aboutxo.py:166
+#: ../src/controlpanel/view/aboutxo.py:167
 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 "
@@ -482,7 +466,7 @@ msgstr ""
 "License). Vous êtes autorisé à le modifier et/ou à en distribuer des copies "
 "aux conditions spécifiées."
 
-#: ../src/controlpanel/view/aboutxo.py:178
+#: ../src/controlpanel/view/aboutxo.py:179
 msgid "Full license:"
 msgstr "Licence complète :"
 
@@ -532,19 +516,33 @@ msgstr "Langue"
 msgid "Network"
 msgstr "Réseau"
 
-#: ../src/controlpanel/view/network.py:53
+#: ../src/controlpanel/view/network.py:54
 msgid "Wireless"
 msgstr "Réseau sans fil"
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
-msgstr "Radio :"
+#: ../src/controlpanel/view/network.py:62
+msgid "Turn of the wireless radio to save battery life"
+msgstr "Désactiver la radio sans fil pour prolonger la batterie"
+
+#: ../src/controlpanel/view/network.py:75
+msgid "Radio"
+msgstr "Radio"
 
-#: ../src/controlpanel/view/network.py:94
+#: ../src/controlpanel/view/network.py:91
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+"Ignorer l'historique réseau si vous avez des difficultés à vous connecter au "
+"réseau"
+
+#: ../src/controlpanel/view/network.py:100
+msgid "Discard network history"
+msgstr "Ignorer l'historique réseau"
+
+#: ../src/controlpanel/view/network.py:113
 msgid "Mesh"
 msgstr "Réseau maillé"
 
-#: ../src/controlpanel/view/network.py:103
+#: ../src/controlpanel/view/network.py:122
 msgid "Server:"
 msgstr "Serveur :"
 
@@ -599,36 +597,36 @@ msgstr "Réseau maillé inconnu"
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../src/view/home/favoritesview.py:287
+#: ../src/view/home/favoritesview.py:296
 msgid "Registration Failed"
 msgstr "Echec de l'enregistrement"
 
-#: ../src/view/home/favoritesview.py:288
+#: ../src/view/home/favoritesview.py:297
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:290
+#: ../src/view/home/favoritesview.py:299
 msgid "Registration Successful"
 msgstr "Enregistrement réussi"
 
-#: ../src/view/home/favoritesview.py:291
+#: ../src/view/home/favoritesview.py:300
 msgid "You are now registered with your school server."
 msgstr "Vous êtes maintenant enregistré sur le serveur de l'école"
 
-#: ../src/view/home/favoritesview.py:407
+#: ../src/view/home/favoritesview.py:420
 msgid "Control Panel"
 msgstr "Panneau de contrôle"
 
-#: ../src/view/home/favoritesview.py:418
+#: ../src/view/home/favoritesview.py:425
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../src/view/home/favoritesview.py:423
+#: ../src/view/home/favoritesview.py:430
 msgid "Shutdown"
 msgstr "Éteindre"
 
-#: ../src/view/home/favoritesview.py:429
+#: ../src/view/home/favoritesview.py:436
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -644,23 +642,34 @@ msgstr "Arrêter"
 msgid "Start"
 msgstr "Lancer"
 
-#: ../src/view/palettes.py:132
+#: ../src/view/palettes.py:138
 msgid "Remove favorite"
 msgstr "Retirer le favori"
 
-#: ../src/view/palettes.py:136
+#: ../src/view/palettes.py:142
 msgid "Make favorite"
 msgstr "Ajouter aux favoris"
 
-#: ../src/view/palettes.py:185
+#: ../src/view/palettes.py:191
 msgid "Show contents"
 msgstr "Afficher les contenus"
 
-#: ../src/view/palettes.py:209
+#: ../src/view/palettes.py:215
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d Mo de libre"
 
+# TRANS: label for the freeform layout in the favorites view
+#~ msgid "Freeform"
+#~ msgstr "Libre"
+
+# TRANS: label for the ring layout in the favorites view
+#~ msgid "Ring"
+#~ msgstr "Concentrique"
+
+#~ msgid "You must enter a server."
+#~ msgstr "Vous devez indiquer un serveur."
+
 #~ msgid "© 2008 One Laptop per Child Assocation "
 #~ msgstr "© 2008 One Laptop per Child Assocation "
 
diff --git a/po/nl.po b/po/nl.po
index 44b423b..d7bf05a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-01 18:31-0400\n"
-"PO-Revision-Date: 2008-09-02 15:10-0400\n"
+"POT-Creation-Date: 2008-09-19 00:30-0400\n"
+"PO-Revision-Date: 2008-09-23 02:46-0400\n"
 "Last-Translator: Myckel Habets <myckel@sdf.lonestar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,15 +35,15 @@ msgstr "Klaar"
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/view/BuddyMenu.py:58
+#: ../src/view/BuddyMenu.py:60
 msgid "Remove friend"
 msgstr "Verwijder vriend"
 
-#: ../src/view/BuddyMenu.py:61
+#: ../src/view/BuddyMenu.py:63
 msgid "Make friend"
 msgstr "Maak vriend"
 
-#: ../src/view/BuddyMenu.py:90
+#: ../src/view/BuddyMenu.py:92
 #, python-format
 msgid "Invite to %s"
 msgstr "Nodig uit voor %s"
@@ -65,7 +65,7 @@ msgstr "Openen"
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:87
+#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:85
 msgid "Keep"
 msgstr "Bewaar"
 
@@ -102,73 +102,61 @@ msgstr "Kan niet met server verbinden."
 msgid "The server could not complete the request."
 msgstr "De server kon de aanvraag niet voltooien."
 
-#: ../src/view/Shell.py:262
+#: ../src/view/Shell.py:251
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../src/view/home/HomeBox.py:81
+#: ../src/view/home/HomeBox.py:79
 msgid "Confirm erase"
 msgstr "Bevestig wissen"
 
-#: ../src/view/home/HomeBox.py:83
+#: ../src/view/home/HomeBox.py:81
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Bevestig wissen: Wilt u permanent %s wissen?"
 
-#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:88 ../src/view/palettes.py:120
 msgid "Erase"
 msgstr "Wissen"
 
-#: ../src/view/home/HomeBox.py:120
+#: ../src/view/home/HomeBox.py:118
 msgid "Software Update"
 msgstr "Software update"
 
-#: ../src/view/home/HomeBox.py:121
+#: ../src/view/home/HomeBox.py:119
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 "Update je activiteiten om er zeker van te zijn dat ze met je nieuwe software "
 "compatibel zijn."
 
-#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
+#: ../src/view/home/HomeBox.py:123 ../src/controlpanel/toolbar.py:115
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:276
+#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/gui.py:286
 msgid "Later"
 msgstr "Later"
 
-#: ../src/view/home/HomeBox.py:130
+#: ../src/view/home/HomeBox.py:128
 msgid "Check now"
 msgstr "Controleer nu"
 
-#: ../src/view/home/HomeBox.py:266
+#: ../src/view/home/HomeBox.py:262
 msgid "List view"
 msgstr "Lijstweergave"
 
-#: ../src/view/home/HomeBox.py:267
+#: ../src/view/home/HomeBox.py:263
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:321
 msgid "Favorites view"
 msgstr "Favorietenweergave"
 
-#: ../src/view/home/HomeBox.py:326
+#: ../src/view/home/HomeBox.py:322
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-# TRANS: label for the freeform layout in the favorites view
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:334
-msgid "Freeform"
-msgstr "VrijeVorm"
-
-# TRANS: label for the ring layout in the favorites view
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:341
-msgid "Ring"
-msgstr "Ring"
-
 #: ../src/view/home/MeshBox.py:97
 msgid "Connect"
 msgstr "Verbinden"
@@ -319,23 +307,23 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Om uw veranderingen toe te passen moet u sugar herstarten.\r\n"
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:268
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:278
 msgid "Changes require restart"
 msgstr "Verandering vereist een herstart"
 
-#: ../src/controlpanel/gui.py:267
+#: ../src/controlpanel/gui.py:277
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../src/controlpanel/gui.py:271
+#: ../src/controlpanel/gui.py:281
 msgid "Cancel changes"
 msgstr "Veranderingen annuleren"
 
-#: ../src/controlpanel/gui.py:280
+#: ../src/controlpanel/gui.py:290
 msgid "Restart now"
 msgstr "Herstart nu"
 
@@ -375,7 +363,7 @@ msgstr "Fout in opgegeven kleuren."
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
-#: ../src/controlpanel/model/datetime.py:85
+#: ../src/controlpanel/model/datetime.py:89
 msgid "Error timezone does not exist."
 msgstr "Fout tijdzone bestaat niet."
 
@@ -387,25 +375,21 @@ msgstr "Waarde moet een geheel getal zijn."
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Kon niet bij ~/.i18n komen. Standaard instellingen aanmaken."
 
-#: ../src/controlpanel/model/language.py:110
+#: ../src/controlpanel/model/language.py:114
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "Taal voor code=%s kon niet bepaald worden."
 
-#: ../src/controlpanel/model/language.py:127
+#: ../src/controlpanel/model/language.py:131
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Sorry, I spreek geen '%s'."
 
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "U moet een server opgeven."
-
-#: ../src/controlpanel/model/network.py:63
+#: ../src/controlpanel/model/network.py:62
 msgid "State is unknown."
 msgstr "Status is onbekend."
 
-#: ../src/controlpanel/model/network.py:83
+#: ../src/controlpanel/model/network.py:82
 msgid "Error in specified radio argument use on/off."
 msgstr "Fout in opgegeven keuze argument gebruik aan/uit."
 
@@ -464,7 +448,7 @@ msgstr ""
 "© 2008 One Laptop per Child Association Inc; Red Hat Inc; en anderen die "
 "bijgedragen hebben."
 
-#: ../src/controlpanel/view/aboutxo.py:166
+#: ../src/controlpanel/view/aboutxo.py:167
 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 "
@@ -476,7 +460,7 @@ msgstr ""
 "u mag het aanpassen en/of kopieën distribueren onder de condities vermeld "
 "in de licentie."
 
-#: ../src/controlpanel/view/aboutxo.py:178
+#: ../src/controlpanel/view/aboutxo.py:179
 msgid "Full license:"
 msgstr "Volledige licentie:"
 
@@ -526,19 +510,33 @@ msgstr "Taal"
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../src/controlpanel/view/network.py:53
+#: ../src/controlpanel/view/network.py:54
 msgid "Wireless"
 msgstr "Draadloos"
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/controlpanel/view/network.py:62
+msgid "Turn of the wireless radio to save battery life"
+msgstr "Draadloze zender uitzetten om de batterij te besparen"
+
+#: ../src/controlpanel/view/network.py:75
+msgid "Radio"
 msgstr "Radio:"
 
-#: ../src/controlpanel/view/network.py:94
+#: ../src/controlpanel/view/network.py:91
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr ""
+"Gooi de netwerkgeschiedenis wel als u problemen heeft om met het netwerk te "
+"verbinden"
+
+#: ../src/controlpanel/view/network.py:100
+msgid "Discard network history"
+msgstr "Netwerkgeschiedenis weggooien"
+
+#: ../src/controlpanel/view/network.py:113
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/controlpanel/view/network.py:103
+#: ../src/controlpanel/view/network.py:122
 msgid "Server:"
 msgstr "Server:"
 
@@ -593,36 +591,36 @@ msgstr "Onbekende Mesh"
 msgid "Decline"
 msgstr "Weigeren"
 
-#: ../src/view/home/favoritesview.py:287
+#: ../src/view/home/favoritesview.py:296
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
 
-#: ../src/view/home/favoritesview.py:288
+#: ../src/view/home/favoritesview.py:297
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:290
+#: ../src/view/home/favoritesview.py:299
 msgid "Registration Successful"
 msgstr "Registratie succesvol uitgevoerd"
 
-#: ../src/view/home/favoritesview.py:291
+#: ../src/view/home/favoritesview.py:300
 msgid "You are now registered with your school server."
 msgstr "Je bent nu geregistreerd bij je schoolserver."
 
-#: ../src/view/home/favoritesview.py:407
+#: ../src/view/home/favoritesview.py:420
 msgid "Control Panel"
 msgstr "Configuratiepaneel"
 
-#: ../src/view/home/favoritesview.py:418
+#: ../src/view/home/favoritesview.py:425
 msgid "Restart"
 msgstr "Herstarten"
 
-#: ../src/view/home/favoritesview.py:423
+#: ../src/view/home/favoritesview.py:430
 msgid "Shutdown"
 msgstr "Afsluiten"
 
-#: ../src/view/home/favoritesview.py:429
+#: ../src/view/home/favoritesview.py:436
 msgid "Register"
 msgstr "Registreren"
 
@@ -638,23 +636,34 @@ msgstr "Stop"
 msgid "Start"
 msgstr "Start"
 
-#: ../src/view/palettes.py:132
+#: ../src/view/palettes.py:138
 msgid "Remove favorite"
 msgstr "Verwijder favoriet"
 
-#: ../src/view/palettes.py:136
+#: ../src/view/palettes.py:142
 msgid "Make favorite"
 msgstr "Maak favoriet"
 
-#: ../src/view/palettes.py:185
+#: ../src/view/palettes.py:191
 msgid "Show contents"
 msgstr "Inhoud weergeven"
 
-#: ../src/view/palettes.py:209
+#: ../src/view/palettes.py:215
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB vrij"
 
+# TRANS: label for the freeform layout in the favorites view
+#~ msgid "Freeform"
+#~ msgstr "VrijeVorm"
+
+# TRANS: label for the ring layout in the favorites view
+#~ msgid "Ring"
+#~ msgstr "Ring"
+
+#~ msgid "You must enter a server."
+#~ msgstr "U moet een server opgeven."
+
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
 
diff --git a/po/pt.po b/po/pt.po
index f301db2..5d1b2a6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-19 00:30-0400\n"
-"PO-Revision-Date: 2008-09-19 14:58-0400\n"
+"PO-Revision-Date: 2008-09-23 21:36-0400\n"
 "Last-Translator: Eduardo H. Silva <HoboPrimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -438,7 +438,7 @@ msgstr "Software"
 
 #: ../src/controlpanel/view/aboutxo.py:100
 msgid "Build:"
-msgstr "Versão do software:"
+msgstr "Versão do Sistema Operativo:"
 
 #: ../src/controlpanel/view/aboutxo.py:115
 msgid "Sugar:"
@@ -467,8 +467,8 @@ msgid ""
 msgstr ""
 "O Sugar é a interface gráfica de utilizador que estás a utilizar. O Sugar é "
 "software livre, licenciado sob a GNU General Public License, e és bem vindo "
-"a fazer alterações a ele e/ou a distribuir cópias dele, segundo certas "
-"condições descritas a seguir."
+"a fazer alterações e/ou a distribuir cópias dele, segundo certas condições "
+"descritas a seguir."
 
 #: ../src/controlpanel/view/aboutxo.py:179
 msgid "Full license:"
@@ -509,7 +509,7 @@ msgstr "Canto"
 
 #: ../src/controlpanel/view/frame.py:115
 msgid "Edge"
-msgstr "Borda"
+msgstr "Lado"
 
 #: ../src/controlpanel/view/language.py:29
 #: ../src/controlpanel/view/language.py:74
diff --git a/po/tr.po b/po/tr.po
index fdaf037..cc97918 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,292 +6,691 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-09 00:30-0500\n"
-"PO-Revision-Date: 2008-02-22 23:10-0500\n"
-"Last-Translator: Serkan Cabi <serkancabi@gmail.com>\n"
+"POT-Creation-Date: 2008-09-19 00:30-0400\n"
+"PO-Revision-Date: 2008-09-22 06:35-0400\n"
+"Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\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: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/intro.py:67
+#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
 msgid "Name:"
 msgstr "İsim:"
 
-#: ../src/intro/intro.py:96
+#: ../src/intro/intro.py:97
 msgid "Click to change color:"
-msgstr "Renk değiştirmek için tıkla:"
+msgstr "Renk değiştirmek için tıklayınız:"
 
-#: ../src/intro/intro.py:146
+#: ../src/intro/intro.py:148
 msgid "Back"
 msgstr "Geri"
 
-#: ../src/intro/intro.py:160
+#: ../src/intro/intro.py:162 ../src/controlpanel/toolbar.py:61
 msgid "Done"
-msgstr "Bitti"
+msgstr "Bitti."
 
-#: ../src/intro/intro.py:163
+#: ../src/intro/intro.py:165
 msgid "Next"
 msgstr "İleri"
 
-#: ../src/view/BuddyMenu.py:59
+#: ../src/view/BuddyMenu.py:60
 msgid "Remove friend"
-msgstr "Arkadaşı sil"
+msgstr "Arkadaşı kaldırınız."
 
-#: ../src/view/BuddyMenu.py:62
+#: ../src/view/BuddyMenu.py:63
 msgid "Make friend"
-msgstr "Arkadaş ol"
+msgstr "Arkadaş olunuz."
 
-#: ../src/view/BuddyMenu.py:84
+#: ../src/view/BuddyMenu.py:92
 #, python-format
 msgid "Invite to %s"
-msgstr "%s için davet et"
+msgstr "%s için davet ediniz."
 
-#: ../src/view/clipboardmenu.py:58
+#: ../src/view/clipboardmenu.py:48
 msgid "Remove"
-msgstr "Kaldır"
+msgstr "Kaldırınız."
 
-#: ../src/view/clipboardmenu.py:63
+#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
 msgid "Open"
-msgstr "Aç"
+msgstr "Açınız."
 
 #. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:73
-msgid "Add to journal"
-msgstr "Günlüğe ekle"
+#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:85
+msgid "Keep"
+msgstr "kaydediniz."
 
-#: ../src/view/clipboardmenu.py:213
+#: ../src/view/clipboardmenu.py:84
+msgid "Open with"
+msgstr "birlikte açınız."
+
+#: ../src/view/clipboardmenu.py:216
 #, python-format
 msgid "Clipboard object: %s."
 msgstr "Pano nesnesi: %s"
 
-#: ../src/hardware/keydialog.py:149
+#: ../src/hardware/keydialog.py:150
 msgid "Key Type:"
 msgstr "Tuş çeşidi:"
 
-#: ../src/hardware/keydialog.py:169
+#: ../src/hardware/keydialog.py:170
 msgid "Authentication Type:"
 msgstr "Kimlik denetleme çeşidi:"
 
-#: ../src/hardware/keydialog.py:250
+#: ../src/hardware/keydialog.py:251
 msgid "Encryption Type:"
 msgstr "Şifreleme çeşidi:"
 
-#: ../src/view/home/activitiesdonut.py:90
-msgid "Starting..."
-msgstr "Başlıyor..."
+#: ../src/hardware/schoolserver.py:17
+msgid "Cannot obtain data needed for registration."
+msgstr "Kayıt için gerekli olan bilgiyi sağlayamıyor."
 
-#: ../src/view/home/activitiesdonut.py:104 ../src/view/home/MeshBox.py:295
-msgid "Resume"
-msgstr "Devam et"
+#: ../src/hardware/schoolserver.py:31
+msgid "Cannot connect to the server."
+msgstr "Sunucuya bağlanamıyor."
 
-#: ../src/view/home/activitiesdonut.py:111
-msgid "Stop"
-msgstr "Dur"
+#: ../src/hardware/schoolserver.py:36
+msgid "The server could not complete the request."
+msgstr "Sunucu talebi yerine getiremiyor."
 
-#: ../src/view/Shell.py:285
+#: ../src/view/Shell.py:251
 msgid "Screenshot"
 msgstr "Ekran Resmi"
 
-#: ../src/view/home/HomeBox.py:159
-msgid "Reboot"
-msgstr "Yeniden Başlat"
+#: ../src/view/home/HomeBox.py:79
+msgid "Confirm erase"
+msgstr "Silmeyi onaylayınız."
 
-#: ../src/view/home/HomeBox.py:164
-msgid "Shutdown"
-msgstr "Kapat"
-
-#: ../src/view/home/HomeBox.py:170
-#, fuzzy
-msgid "Register"
-msgstr "Kayıt"
+#: ../src/view/home/HomeBox.py:81
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Silme onayı: %s'i tamamen silmek mi istiyorsunuz?"
 
-#: ../src/view/home/HomeBox.py:175 ../src/view/home/HomeBox.py:216
-msgid "About this XO"
-msgstr "Bu XO hakkında"
+#: ../src/view/home/HomeBox.py:88 ../src/view/palettes.py:120
+msgid "Erase"
+msgstr "Siliniz."
 
-#: ../src/view/home/HomeBox.py:222
-#, fuzzy
-msgid "Not available"
-msgstr "Uygun değil"
-
-#. Only show disconnect when there's a mesh device, because mesh takes
-#. priority over the normal wireless device.  NM doesn't have a "disconnect"
-#. method for a device either (for various reasons) so this doesn't
-#. have a good mapping
-#: ../src/view/home/MeshBox.py:90 ../src/view/home/MeshBox.py:197
-#: ../src/view/devices/network/wireless.py:113
-#: ../src/view/devices/network/mesh.py:83
-msgid "Disconnect..."
-msgstr "Bağlantıyı kes..."
+#: ../src/view/home/HomeBox.py:118
+msgid "Software Update"
+msgstr "Yazılım güncellemesi"
 
-#: ../src/view/home/MeshBox.py:195 ../src/view/devices/network/mesh.py:37
-#: ../src/view/devices/network/mesh.py:62
-#: ../src/view/devices/network/mesh.py:66
+#: ../src/view/home/HomeBox.py:119
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Yeni yazılımınızla olan uyumluluktan emin olmak için aktivitelerinizi "
+"güncelleyiniz."
+
+#: ../src/view/home/HomeBox.py:123 ../src/controlpanel/toolbar.py:115
+msgid "Cancel"
+msgstr "İptal ediniz."
+
+#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/gui.py:286
+msgid "Later"
+msgstr "Sonra"
+
+#: ../src/view/home/HomeBox.py:128
+msgid "Check now"
+msgstr "Şimdi kontrol ediniz."
+
+#: ../src/view/home/HomeBox.py:262
+msgid "List view"
+msgstr "Görünümleri listeleyiniz."
+
+#: ../src/view/home/HomeBox.py:263
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/view/home/HomeBox.py:321
+msgid "Favorites view"
+msgstr "favori görünüm"
+
+#: ../src/view/home/HomeBox.py:322
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/view/home/MeshBox.py:97
+msgid "Connect"
+msgstr "Bağlanınız."
+
+#: ../src/view/home/MeshBox.py:106
+msgid "Disconnect"
+msgstr "Bağlantıyı kesiniz."
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device.  NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../src/view/home/MeshBox.py:118
+msgid "Disconnecting..."
+msgstr "Bağlantı kesiliyor..."
+
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device.  NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../src/view/home/MeshBox.py:152
+msgid "Connecting..."
+msgstr "Bağlantı kuruluyor..."
+
+#. TODO: show the channel number
+#: ../src/view/home/MeshBox.py:159
+msgid "Connected"
+msgstr "bağlantı kuruldu."
+
+#. only temporarily
+#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:51
+#: ../src/view/devices/network/mesh.py:92
+#: ../src/view/devices/network/mesh.py:96
 msgid "Mesh Network"
 msgstr "Örgüsel Ağ"
 
-#: ../src/view/home/MeshBox.py:300
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device.  NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:160
+#: ../src/view/devices/network/mesh.py:125
+msgid "Disconnect..."
+msgstr "Bağlantıyı kesiniz..."
+
+#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
+msgid "Resume"
+msgstr "Devam ediniz."
+
+#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:205
 msgid "Join"
-msgstr "Katıl"
+msgstr "Katılınız."
+
+#: ../src/view/devices/battery.py:45
+msgid "My Battery"
+msgstr "şarjım"
+
+#: ../src/view/devices/battery.py:114
+msgid "Charging"
+msgstr "şarj olma"
+
+#: ../src/view/devices/battery.py:117
+msgid "Very little power remaining"
+msgstr "çok az şarj kaldı."
+
+#: ../src/view/devices/battery.py:123
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d kaldı."
 
-#: ../src/view/devices/battery.py:38
-msgid "My Battery life"
-msgstr "Pil ömrüm"
+#: ../src/view/devices/battery.py:127
+msgid "Charged"
+msgstr "şarj edildi."
 
-#: ../src/view/devices/battery.py:94
-msgid "Battery charging"
-msgstr "Pil doluyor"
+#: ../src/view/devices/speaker.py:44
+msgid "My Speakers"
+msgstr "mikrofonlarım"
 
-#: ../src/view/devices/battery.py:96
-msgid "Battery discharging"
-msgstr "Pil boşalıyor"
+#: ../src/view/devices/speaker.py:119
+msgid "Unmute"
+msgstr "sesli"
 
-#: ../src/view/devices/battery.py:98
-msgid "Battery fully charged"
-msgstr "Pil tam dolu"
+#: ../src/view/devices/speaker.py:122
+msgid "Mute"
+msgstr "sessiz"
 
-#: ../src/view/devices/network/wireless.py:61
+#: ../src/view/devices/network/wireless.py:37
+#, python-format
+msgid "IP address: %s"
+msgstr "IP adresi: %s"
+
+#: ../src/view/devices/network/wireless.py:86
 msgid "Disconnected"
-msgstr "Bağlantı kesildi"
+msgstr "Bağlantı kesildi."
 
-#: ../src/view/devices/network/wireless.py:131
+#: ../src/view/devices/network/wireless.py:178
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../src/view/frame/zoomtoolbar.py:42
+#: ../src/view/frame/zoomtoolbar.py:37
 msgid "Neighborhood"
 msgstr "Komşuluk"
 
-#: ../src/view/frame/zoomtoolbar.py:54
+#: ../src/view/frame/zoomtoolbar.py:39
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/view/frame/zoomtoolbar.py:66
+#: ../src/view/frame/zoomtoolbar.py:41
 msgid "Home"
 msgstr "Ana ekran"
 
-#: ../src/view/frame/zoomtoolbar.py:78
+#: ../src/view/frame/zoomtoolbar.py:43
 msgid "Activity"
 msgstr "Etkinlik"
 
-#: ../src/controlpanel/control.py:219
+#: ../src/controlpanel/cmd.py:26
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar kontrol paneli: dikkat, %s modül: %r adıyla birden fazla seçenek "
+"bulundu."
+
+#: ../src/controlpanel/cmd.py:28
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar kontrol panel: anahtar=%s geçerli bir seçenek değildir."
+
+#: ../src/controlpanel/cmd.py:29
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar kontrol panel: %s"
+
+#: ../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"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"kullanım: sugar kontrol panel [seçenek] anahtar [args...]            sugar "
+"ortamı için kontrol.            seçenekler: \n"
+"-h_          : yardım mesajını gösteriniz ve çıkınız.           -l_ "
+"          : uygun olan tüm seçenekleri gösteriniz.            -h key      : "
+"bu kilit hakkındaki bilgiyi gösteriniz.          -g key      : kilidin "
+"şimdiki değerini alınız.           -s key      : kilidin şimdiki değerini "
+"oluşturunuz.-c key      : kilidin şimdiki değerini siliniz."
+
+#: ../src/controlpanel/cmd.py:46
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Değişikliklerin etkinleşmesi için yeniden başlatın.\n"
+msgstr "Değişikliklerin etkinleşmesi için sugar'ı yeniden başlatınız.\n"
 
-#: ../src/controlpanel/control.py:273
-msgid "Error in specified color modifiers."
-msgstr "Belirtilen renk değiştiricilerinde hata."
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
+msgid "Ok"
+msgstr "tamam"
 
-#: ../src/controlpanel/control.py:276
-msgid "Error in specified colors."
-msgstr "Belirtilen renklerde hata."
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:278
+msgid "Changes require restart"
+msgstr "değişiklikler bilgisayarın tekrar başlatılmasını gerektiriyor."
 
-#: ../src/controlpanel/control.py:312
-msgid "off"
-msgstr "kapalı"
+#: ../src/controlpanel/gui.py:277
+msgid "Warning"
+msgstr "uyarı"
 
-#: ../src/controlpanel/control.py:314
-msgid "on"
-msgstr "açık"
+#: ../src/controlpanel/gui.py:281
+msgid "Cancel changes"
+msgstr "değişiklikleri iptal ediniz."
 
-#: ../src/controlpanel/control.py:316
-msgid "State is unknown."
-msgstr "Durum bilinmiyor."
+#: ../src/controlpanel/gui.py:290
+msgid "Restart now"
+msgstr "bilgisayarı şimdi tekrar başlatınız."
 
-#: ../src/controlpanel/control.py:336
-msgid "Error in specified radio argument use on/off."
-msgstr ""
+#: ../src/controlpanel/model/aboutme.py:44
+msgid "You must enter a name."
+msgstr "bir isim girmeniz gerekmektedir."
 
-#: ../src/controlpanel/control.py:340
-msgid "Permission denied. You need to be root to run this method."
-msgstr ""
+#: ../src/controlpanel/model/aboutme.py:69
+#, python-format
+msgid "stroke:   color=%s hue=%s"
+msgstr "fırça darbesi:      renk= %renk=%s"
 
-#: ../src/controlpanel/control.py:370
-msgid "Error in reading timezone"
-msgstr ""
+#: ../src/controlpanel/model/aboutme.py:72
+#, python-format
+msgid "stroke:   %s"
+msgstr "fırça darbesi:     %s"
 
-#: ../src/controlpanel/control.py:401
+#: ../src/controlpanel/model/aboutme.py:74
 #, python-format
-msgid "Error copying timezone (from %s): %s"
-msgstr ""
+msgid "fill:     color=%s hue=%s"
+msgstr "doldurunuz:       renk=%s renk=%s"
 
-#: ../src/controlpanel/control.py:406
+#: ../src/controlpanel/model/aboutme.py:76
 #, python-format
-msgid "Changing permission of timezone: %s"
-msgstr ""
+msgid "fill:     %s"
+msgstr "doldurunuz:           %s"
+
+#: ../src/controlpanel/model/aboutme.py:87
+msgid "Error in specified color modifiers."
+msgstr "Belirtilen renk değiştiricilerinde hata bulunmaktadır."
 
-#: ../src/controlpanel/control.py:416
+#: ../src/controlpanel/model/aboutme.py:90
+msgid "Error in specified colors."
+msgstr "Belirtilen renklerde hata."
+
+#: ../src/controlpanel/model/aboutxo.py:24
+msgid "Not available"
+msgstr "mevcut değildir."
+
+#: ../src/controlpanel/model/datetime.py:89
 msgid "Error timezone does not exist."
-msgstr ""
+msgstr "hatalı zaman dilimi yoktur."
 
-#: ../src/controlpanel/control.py:421 ../src/controlpanel/control.py:440
-#, python-format
-msgid "Could not access %s. Create standard settings."
-msgstr ""
+#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
+msgid "Value must be an integer."
+msgstr "değer bir tamsayı olmalıdır."
+
+#: ../src/controlpanel/model/language.py:28
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "~/.i18n'e giremiyor. standart ayarlar oluşturunuz."
 
-#: ../src/controlpanel/control.py:467
+#: ../src/controlpanel/model/language.py:114
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr ""
+msgstr "kod=%s için dil tanımlanamadı."
 
-#: ../src/controlpanel/control.py:477
+#: ../src/controlpanel/model/language.py:131
 #, python-format
 msgid "Sorry I do not speak '%s'."
-msgstr ""
+msgstr "üzgünüm, %s konusmuyorum."
+
+#: ../src/controlpanel/model/network.py:62
+msgid "State is unknown."
+msgstr "Durum bilinmiyor."
+
+#: ../src/controlpanel/model/network.py:82
+msgid "Error in specified radio argument use on/off."
+msgstr "belirtilen radyoda hata vardır, açma kapama yapınız."
+
+#: ../src/controlpanel/model/power.py:57
+msgid "Error in automatic pm argument, use on/off."
+msgstr "otomatik pm'de hata vardır, açma kapama yapınız."
+
+#: ../src/controlpanel/model/power.py:86
+msgid "Error in extreme pm argument, use on/off."
+msgstr "en uç pm'de hata vardır, açma kapama yapınız."
+
+#: ../src/controlpanel/view/aboutme.py:32
+msgid "About Me"
+msgstr "benim hakkımda"
+
+#: ../src/controlpanel/view/aboutme.py:134
+msgid "Click to change your color:"
+msgstr "Renk değiştirmek için tıklayınız:"
+
+#: ../src/controlpanel/view/aboutxo.py:28
+msgid "About my XO"
+msgstr "benim XO'm hakkında"
+
+#: ../src/controlpanel/view/aboutxo.py:59
+msgid "Identity"
+msgstr "kimlik"
+
+#: ../src/controlpanel/view/aboutxo.py:68
+msgid "Serial Number:"
+msgstr "seri numarası:"
+
+#: ../src/controlpanel/view/aboutxo.py:91
+msgid "Software"
+msgstr "yazılım"
 
-#: ../src/controlpanel/cmd.py:27
+#: ../src/controlpanel/view/aboutxo.py:100
+msgid "Build:"
+msgstr "kurunuz:"
+
+#: ../src/controlpanel/view/aboutxo.py:115
+msgid "Sugar:"
+msgstr "Sugar:"
+
+#: ../src/controlpanel/view/aboutxo.py:130
+msgid "Firmware:"
+msgstr "aygıt yazılımı"
+
+#: ../src/controlpanel/view/aboutxo.py:152
+msgid "Copyright and License"
+msgstr "Telif hakkı ve lisans"
+
+#: ../src/controlpanel/view/aboutxo.py:160
 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"
-"    "
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 msgstr ""
+"© 2008 Her Çocuğa Bir Laptop Birliği ; Red Hat Şirketi ; ve katkıda "
+"bulunanlar."
 
-#: ../src/controlpanel/cmd.py:55 ../src/controlpanel/cmd.py:67
-#: ../src/controlpanel/cmd.py:74
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
+#: ../src/controlpanel/view/aboutxo.py:167
+msgid ""
+"Sugar is the graphical user interface that you are looking at. Sugar is free "
+"software, covered by the GNU General Public License, and you are welcome to "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
 msgstr ""
+"Sugar gördüğünüz grafiksel kullanıcı arayüzüdür. Sugar, GNU General Public "
+"Lisans'ına sahip, ücretsiz bir yazılımdır ve burada açıklanan belli koşullar "
+"altında dilerseniz yazılımı değiştirebilirsiniz ve/veya kopyasını "
+"dağıtabilirsiniz."
+
+#: ../src/controlpanel/view/aboutxo.py:179
+msgid "Full license:"
+msgstr "Tam lisans:"
+
+#: ../src/controlpanel/view/datetime.py:29
+msgid "Date & Time"
+msgstr "tarih ve zaman"
+
+#: ../src/controlpanel/view/datetime.py:72
+msgid "Timezone"
+msgstr "saat dilimi"
+
+#: ../src/controlpanel/view/frame.py:28
+msgid "Frame"
+msgstr "çerçeve"
+
+#: ../src/controlpanel/view/frame.py:30
+msgid "never"
+msgstr "asla"
 
-#: ../src/controlpanel/cmd.py:80
+#: ../src/controlpanel/view/frame.py:31
+msgid "instantaneous"
+msgstr "anlık"
+
+#: ../src/controlpanel/view/frame.py:32
 #, python-format
-msgid "sugar-control-panel: %s"
+msgid "%s seconds"
+msgstr "%s saniye"
+
+#: ../src/controlpanel/view/frame.py:56
+msgid "Activation Delay"
+msgstr "aktivasyon gecikmesi"
+
+#: ../src/controlpanel/view/frame.py:80
+msgid "Corner"
+msgstr "köşe"
+
+#: ../src/controlpanel/view/frame.py:115
+msgid "Edge"
+msgstr "kenar"
+
+#: ../src/controlpanel/view/language.py:29
+#: ../src/controlpanel/view/language.py:74
+msgid "Language"
+msgstr "dil"
+
+#: ../src/controlpanel/view/network.py:28
+msgid "Network"
+msgstr "ağ"
+
+#: ../src/controlpanel/view/network.py:54
+msgid "Wireless"
+msgstr "kablosuz"
+
+#: ../src/controlpanel/view/network.py:62
+msgid "Turn of the wireless radio to save battery life"
+msgstr "şarj ömrünü uzatmak için kablosuz bağlantı özelliğini kapatınız."
+
+#: ../src/controlpanel/view/network.py:75
+msgid "Radio"
+msgstr "radyo"
+
+#: ../src/controlpanel/view/network.py:91
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "ağa bağlanmada sorun yaşıyorsanız ağ geçmişini siliniz."
+
+#: ../src/controlpanel/view/network.py:100
+msgid "Discard network history"
+msgstr "ağ geçmişini siliniz"
+
+#: ../src/controlpanel/view/network.py:113
+msgid "Mesh"
+msgstr "ağ"
+
+#: ../src/controlpanel/view/network.py:122
+msgid "Server:"
+msgstr "sunucu:"
+
+#: ../src/controlpanel/view/power.py:27
+msgid "Power"
+msgstr "güç"
+
+#: ../src/controlpanel/view/power.py:51
+msgid "Power management"
+msgstr "güç kontrolü"
+
+#: ../src/controlpanel/view/power.py:61
+msgid "Automatic power management (increases battery life)"
+msgstr "otomatik güç kontrolü( pilin ömrünü uzatır)"
+
+#: ../src/controlpanel/view/power.py:89
+msgid ""
+"Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
+"aşırı güç kontrolü (kablosuz radyoyu etkisiz kılar, şarjın ömrünü uzatır)"
 
-#: ../src/view/devices/network/mesh.py:105
+#: ../src/view/devices/network/mesh.py:154
 msgid "Connected to a School Mesh Portal"
-msgstr ""
+msgstr "okul ağ portalına bağlandı."
 
-#: ../src/view/devices/network/mesh.py:107
+#: ../src/view/devices/network/mesh.py:156
 msgid "Looking for a School Mesh Portal..."
-msgstr ""
+msgstr "okul ağ portalı aranıyor..."
 
-#: ../src/view/devices/network/mesh.py:110
+#: ../src/view/devices/network/mesh.py:159
 msgid "Connected to an XO Mesh Portal"
-msgstr ""
+msgstr "XO ağ portalına bağlandı."
 
-#: ../src/view/devices/network/mesh.py:112
+#: ../src/view/devices/network/mesh.py:161
 msgid "Looking for an XO Mesh Portal..."
-msgstr ""
+msgstr "XO ağ portalı aranıyor..."
 
-#: ../src/view/devices/network/mesh.py:115
+#: ../src/view/devices/network/mesh.py:164
 msgid "Connected to a Simple Mesh"
-msgstr ""
+msgstr "sadece ağa bağlandı."
 
-#: ../src/view/devices/network/mesh.py:117
+#: ../src/view/devices/network/mesh.py:166
 msgid "Starting a Simple Mesh"
-msgstr ""
+msgstr "basit bir ağ başlatıyor."
 
-#: ../src/view/devices/network/mesh.py:124
+#: ../src/view/devices/network/mesh.py:173
 msgid "Unknown Mesh"
-msgstr ""
+msgstr "bilinmeyen ağ"
+
+#: ../src/view/frame/activitiestray.py:210
+msgid "Decline"
+msgstr "azaltınız."
+
+#: ../src/view/home/favoritesview.py:296
+msgid "Registration Failed"
+msgstr "kayıt gerçekleştirilemedi."
+
+#: ../src/view/home/favoritesview.py:297
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/view/home/favoritesview.py:299
+msgid "Registration Successful"
+msgstr "kayıt yapıldı."
+
+#: ../src/view/home/favoritesview.py:300
+msgid "You are now registered with your school server."
+msgstr "okul sunucunuzla kayıt oldunuz."
+
+#: ../src/view/home/favoritesview.py:420
+msgid "Control Panel"
+msgstr "kontrol paneli"
+
+#: ../src/view/home/favoritesview.py:425
+msgid "Restart"
+msgstr "tekrar başlatınız."
+
+#: ../src/view/home/favoritesview.py:430
+msgid "Shutdown"
+msgstr "Kapatınız."
+
+#: ../src/view/home/favoritesview.py:436
+msgid "Register"
+msgstr "Kayıt olunuz."
+
+#: ../src/view/palettes.py:42
+msgid "Starting..."
+msgstr "Başlıyor..."
+
+#: ../src/view/palettes.py:72
+msgid "Stop"
+msgstr "durdurunuz."
+
+#: ../src/view/palettes.py:104
+msgid "Start"
+msgstr "başlatınız."
+
+#: ../src/view/palettes.py:138
+msgid "Remove favorite"
+msgstr "favorilerimden kaldırınız."
+
+#: ../src/view/palettes.py:142
+msgid "Make favorite"
+msgstr "favorim yapınız."
+
+#: ../src/view/palettes.py:191
+msgid "Show contents"
+msgstr "içeriği gösteriniz."
+
+#: ../src/view/palettes.py:215
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB boştur."
+
+# TRANS: label for the freeform layout in the favorites view
+#~ msgid "Freeform"
+#~ msgstr "serbest form"
+
+# TRANS: label for the ring layout in the favorites view
+#~ msgid "Ring"
+#~ msgstr "yuvarlak etiket"
+
+#~ msgid "You must enter a server."
+#~ msgstr "bir sunucu girmeniz gerekmektedir."
+
+#~ msgid "<Ctrl>R"
+#~ msgstr "<Ctrl>R"
+
+#~ msgid "off"
+#~ msgstr "kapalı"
+
+#~ msgid "on"
+#~ msgstr "açık"
+
+#~ msgid "About this XO"
+#~ msgstr "Bu XO hakkında"
+
+#~ msgid "Add to journal"
+#~ msgstr "Günlüğe ekle"
+
+#~ msgid "Reboot"
+#~ msgstr "Yeniden Başlat"
+
+#~ msgid "My Battery life"
+#~ msgstr "Pil ömrüm"
+
+#~ msgid "Battery charging"
+#~ msgstr "Pil doluyor"
+
+#~ msgid "Battery discharging"
+#~ msgstr "Pil boşalıyor"
+
+#~ msgid "Battery fully charged"
+#~ msgstr "Pil tam dolu"
diff --git a/src/hardware/keydialog.py b/src/hardware/keydialog.py
index 92f6776..88a551f 100644
--- a/src/hardware/keydialog.py
+++ b/src/hardware/keydialog.py
@@ -265,15 +265,13 @@ class WPAKeyDialog(KeyDialog):
             real_key = key
         elif len(key) >= 8 and len(key) <= 63:
             # passphrase
-            import commands
-            command = "/usr/sbin/wpa_passphrase '%s' '%s'" % (ssid, key)
-            (s, o) = commands.getstatusoutput(command)
-            if s != 0:
-                raise RuntimeError("Error hashing passphrase: %s" % o)
-            lines = o.split("\n")
-            for line in lines:
+            from subprocess import Popen, PIPE
+            p = Popen(['/usr/sbin/wpa_passphrase', ssid, key], stdout=PIPE)
+            for line in p.stdout:
                 if line.strip().startswith("psk="):
                     real_key = line.strip()[4:]
+            if p.wait() != 0:
+                raise RuntimeError("Error hashing passphrase")
             if real_key and len(real_key) != 64:
                 real_key = None
 
diff --git a/src/main.py b/src/main.py
index 1bb91af..890002e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -21,8 +21,10 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import gobject
+import dbus.glib
 
 gtk.gdk.threads_init()
+dbus.glib.threads_init()
 
 from sugar import logger
 from sugar.profile import get_profile
diff --git a/src/view/home/HomeBox.py b/src/view/home/HomeBox.py
index 0655253..1eebb40 100644
--- a/src/view/home/HomeBox.py
+++ b/src/view/home/HomeBox.py
@@ -247,6 +247,7 @@ class HomeToolbar(gtk.Toolbar):
         self.search_entry.connect('activate', self.__entry_activated_cb)
         self.search_entry.connect('changed', self.__entry_changed_cb)
         tool_item.add(self.search_entry)
+        self.search_entry.set_sensitive(False)
         self.search_entry.show()
 
         self._add_separator(expand=True)
@@ -271,8 +272,12 @@ class HomeToolbar(gtk.Toolbar):
     def __view_button_toggled_cb(self, button, view):
         if button.props.active:
             if view == _FAVORITES_VIEW:
+                self.search_entry.set_text('')
+                self.search_entry.set_sensitive(False)
                 self.emit('view-changed', view, button.layout)
             else:
+                self.search_entry.set_sensitive(True)
+                self.search_entry.grab_focus()
                 self.emit('view-changed', view, None)
             
     def _add_separator(self, expand=False):
diff --git a/src/view/home/transitionbox.py b/src/view/home/transitionbox.py
index fb351f8..4a6599a 100644
--- a/src/view/home/transitionbox.py
+++ b/src/view/home/transitionbox.py
@@ -55,8 +55,8 @@ class _Layout(gobject.GObject, hippo.CanvasLayout):
             min_width, child_width = child.get_width_request()
             min_height, child_height = child.get_height_request(child_width)
 
-            child.allocate(x + (width - child_width) / 2,
-                           y + (height - child_height) / 2,
+            child.allocate(x + (width - child_width) / 2 - 1,
+                           y + (height - child_height) / 2 - 2,
                            child_width, child_height, origin_changed)
 
 class TransitionBox(hippo.Canvas):